Attachment #233920 for bug #408230

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 1-11 Link Here

(-)a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/TypeResolveTests.java (-1 / +107 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2012 IBM Corporation and others.	2	* Copyright (c) 2000, 2013 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
		7	*
		8	* This is an implementation of an early-draft specification developed under the Java
		9	* Community Process (JCP) and is made available for testing and evaluation purposes
		10	* only. The code is not compatible with any specification of the JCP.
7	*	11	*
8	* Contributors:	12	* Contributors:
9	* IBM Corporation - initial API and implementation	13	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	14	*******************************************************************************/
11	package org.eclipse.jdt.core.tests.model;	15	package org.eclipse.jdt.core.tests.model;
Lines 832-837 Link Here
832	}	836	}
833	finally {	837	finally {
834	deleteProject("Test342393");	838	deleteProject("Test342393");
835	}	839	}
836	}	840	}
		841	// Bug 408230 - [1.8][hovering] NPE on hovering over a type inferred parameter in lambda expression
		842	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=408230
		843	public void testBug408230a() throws CoreException {
		844	try {
		845	createJavaProject("P", new String[] {"src"}, new String[] {"JCL18_LIB"}, "bin", "1.8");
		846	String source = "package p;\n" +
		847	"public class X {\n" +
		848	" FI i1 = (a, b) -> a+b;\n" +
		849	" void foo() {\n" +
		850	" FI i2 = (a,barg) -> { return a+barg; };\n" +
		851	" }\n" +
		852	"}\n" +
		853	"interface FI { int f1(int a, int b); }\n";
		854	createFolder("/P/src/p");
		855	createFile(
		856	"/P/src/p/X.java",
		857	source
		858	);
		859	waitForAutoBuild();
		860
		861	ICompilationUnit unit = getCompilationUnit("/P/src/p/X.java");
		862	String selectString = "barg";
		863	((ICodeAssist) unit).codeSelect(source.lastIndexOf(selectString), selectString.length());
		864	} finally {
		865	deleteProject("P");
		866	}
		867	}
		868	public void testBug408230b() throws CoreException {
		869	try {
		870	createJavaProject("P", new String[] {"src"}, new String[] {"JCL18_LIB"}, "bin", "1.8");
		871	String source = "package p;\n" +
		872	"public class X {\n" +
		873	" FI i1 = (a, b) -> a+b;\n" +
		874	" void foo() {\n" +
		875	" FI i2 = (aarg) -> { return aarg; };\n" +
		876	" }\n" +
		877	"}\n" +
		878	"interface FI { int f1(int a, int b); }\n";
		879	createFolder("/P/src/p");
		880	createFile(
		881	"/P/src/p/X.java",
		882	source
		883	);
		884	waitForAutoBuild();
		885
		886	ICompilationUnit unit = getCompilationUnit("/P/src/p/X.java");
		887	String selectString = "aarg";
		888	((ICodeAssist) unit).codeSelect(source.lastIndexOf(selectString), selectString.length());
		889	} finally {
		890	deleteProject("P");
		891	}
		892	}
		893	public void testBug408230c() throws CoreException {
		894	try {
		895	createJavaProject("P", new String[] {"src"}, new String[] {"JCL18_LIB"}, "bin", "1.8");
		896	String source = "package p;\n" +
		897	"public class X {\n" +
		898	" FI i1 = (a, barg) -> a+barg;\n" +
		899	" void foo() {\n" +
		900	" FI i2 = (a,b) -> { return a+b; };\n" +
		901	" }\n" +
		902	"}\n" +
		903	"interface FI { int f1(int a, int b); }\n";
		904	createFolder("/P/src/p");
905	createFile(
906	"/P/src/p/X.java",
907	source
908	);
909	waitForAutoBuild();
910
911	ICompilationUnit unit = getCompilationUnit("/P/src/p/X.java");
912	String selectString = "barg";
913	((ICodeAssist) unit).codeSelect(source.lastIndexOf(selectString), selectString.length());
914	} finally {
915	deleteProject("P");
916	}
917	}
918	public void testBug408230d() throws CoreException {
919	try {
920	createJavaProject("P", new String[] {"src"}, new String[] {"JCL18_LIB"}, "bin", "1.8");
921	String source = "package p;\n" +
922	"public class X {\n" +
923	" FI i1 = (aarg) -> aarg++;\n" +
924	" void foo() {\n" +
925	" FI i2 = (a,b) -> { return a+b; };\n" +
926	" }\n" +
927	"}\n" +
928	"interface FI { int f1(int a, int b); }\n";
929	createFolder("/P/src/p");
930	createFile(
931	"/P/src/p/X.java",
932	source
933	);
934	waitForAutoBuild();
935
936	ICompilationUnit unit = getCompilationUnit("/P/src/p/X.java");
937	String selectString = "aarg";
938	((ICodeAssist) unit).codeSelect(source.lastIndexOf(selectString), selectString.length());
939	} finally {
940	deleteProject("P");
941	}
942	}
837	}	943	}




		this action is also performed when shifting token after recovery
		got activated once.
	*/
	recoveryTokenCheck();
}
protected void consumeTypeElidedLambdaParameter(boolean parenthesized) {
	if (this.astStack[this.astPtr] instanceof LocalDeclaration) {
		this.astStack[this.astPtr].bits |= ASTNode.IsInitializedByLamdaExpression;
	}
	super.consumeTypeElidedLambdaParameter(parenthesized);
}

public  String toString() {
	String s = Util.EMPTY_STRING;
	s = s + "elementKindStack : int[] = {"; //$NON-NLS-1$
	for (int i = 0; i <= this.elementPtr; i++) {




	public final static int Bit3 = 0x4;					// return type (operator) | name reference kind (name ref) | implicit this (this ref) | is argument(local)
	public final static int Bit4 = 0x8;					// return type (operator) | first assignment to local (name ref,local decl) | undocumented empty block (block, type and method decl)
	public final static int Bit5 = 0x10;					// value for return (expression) | has all method bodies (unit) | supertype ref (type ref) | resolved (field decl)
	public final static int Bit6 = 0x20;					// depth (name ref, msg) | ignore need cast check (cast expression) | error in signature (method declaration/ initializer) | is recovered (annotation reference)
	public final static int Bit7 = 0x40;					// depth (name ref, msg) | operator (operator) | need runtime checkcast (cast expression) | label used (labelStatement) | needFreeReturn (AbstractMethodDeclaration)
	public final static int Bit8 = 0x80;					// depth (name ref, msg) | operator (operator) | unsafe cast (cast expression) | is default constructor (constructor declaration) | isElseStatementUnreachable (if statement) | IsInitializedByLambdaExpression (local declaration)
	public final static int Bit9 = 0x100;				// depth (name ref, msg) | operator (operator) | is local type (type decl) | isThenStatementUnreachable (if statement) | can be static
	public final static int Bit10= 0x200;				// depth (name ref, msg) | operator (operator) | is anonymous type (type decl)
	public final static int Bit11 = 0x400;				// depth (name ref, msg) | operator (operator) | is member type (type decl)
	public final static int Bit12 = 0x800;				// depth (name ref, msg) | operator (operator) | has abstract methods (type decl)
	public final static int Bit13 = 0x1000;			// depth (name ref, msg) | is secondary type (type decl)

	public static final int IsTypeElided = Bit2;  // type elided lambda argument.
	public static final int IsArgument = Bit3;
	public static final int IsLocalDeclarationReachable = Bit31;
	public static final int IsForeachElementVariable = Bit5;
	public static final int ShadowsOuterLocal = Bit22;
	public static final int IsInitializedByLamdaExpression = Bit8;

	// for name refs or local decls
	public static final int FirstAssignmentToLocal = Bit4;

	// for msg or field references




/*******************************************************************************
 * Copyright (c) 2000, 2013 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * This is an implementation of an early-draft specification developed under the Java
 * Community Process (JCP) and is made available for testing and evaluation purposes
 * only. The code is not compatible with any specification of the JCP.
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.compiler.parser;


import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
import org.eclipse.jdt.internal.compiler.ast.Argument;
import org.eclipse.jdt.internal.compiler.ast.ASTNode;
import org.eclipse.jdt.internal.compiler.ast.Block;
import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
import org.eclipse.jdt.internal.compiler.ast.LambdaExpression;
import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration;
import org.eclipse.jdt.internal.compiler.ast.Statement;
import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;


	public Block blockDeclaration;
	public RecoveredStatement[] statements;
	public int statementCount;
	public boolean preserveContent = false;
	public RecoveredLocalVariable [] pendingArguments = null;

	int pendingModifiers;
	int pendingModifersSourceStart = -1;
	RecoveredAnnotation[] pendingAnnotations;
	int pendingAnnotationCount;

			return this; // ignore this element
		}
	}
	return super.add(methodDeclaration, bracketBalanceValue);
}
public void addPendingArgument(RecoveredLocalVariable pendingArg) {
	if (this.pendingArguments == null) {
		RecoveredLocalVariable recoveredLocalVariable [] = {pendingArg};
		this.pendingArguments = recoveredLocalVariable;
	}
	else {
		int length = this.pendingArguments.length;
		System.arraycopy(this.pendingArguments, 0, this.pendingArguments = new RecoveredLocalVariable[length+1], 0, length);
		this.pendingArguments[length] = pendingArg;
	}
}
/*
 * Record a nested block declaration
 */
public RecoveredElement add(Block nestedBlockDeclaration, int bracketBalanceValue) {
	resetPendingModifiers();

	}

	RecoveredBlock element = new RecoveredBlock(nestedBlockDeclaration, this, bracketBalanceValue);

	// if we have a pending Argument, promote it into the new block
	if (this.pendingArguments != null) {
		for (int indx = 0; indx < this.pendingArguments.length; indx++) {
			element.attach(this.pendingArguments[indx]);			
		}
		this.pendingArguments = null;
	}
	if(parser().statementRecoveryActivated) {
		addBlockStatement(element);
	}
	attach(element);

				this.pendingModifersSourceStart);
	}
	resetPendingModifiers();

	if (localDeclaration instanceof Argument){
		addPendingArgument(element);
		return this;
	}

	attach(element);
	if (localDeclaration.declarationSourceEnd == 0) return element;

	return result.toString();
}
/*
 * Rebuild a block from the nested structure which is in scope
 */
public Block updatedBlock(int depth, Set knownTypes) {
	return updatedBlock(depth, knownTypes, false);
}
public Block updatedBlock(int depth, Set knownTypes, boolean lambdaExpressionExpected) {

	// if block was not marked to be preserved or empty, then ignore it
	if (!this.preserveContent || this.statementCount == 0) return null;

	Statement[] updatedStatements = new Statement[this.statementCount];


	int lastEnd = this.blockDeclaration.sourceStart;

	// only collect the non-null updated statements
	for (int i = 0; i < this.statementCount; i++){
		boolean lambdaExprInit = i > 0 && lambdaExpressionInitializable(this.statements[i-1]);
		Statement updatedStatement = this.statements[i].updatedStatement(depth, knownTypes, lambdaExprInit);
		if (updatedStatement != null){
			LambdaExpression lambdaExpr = getLambdaExpression(updatedStatement);
			if (lambdaExprInit && lambdaExpr != null) {
				((LocalDeclaration)updatedStatements[updatedCount-1]).initialization = lambdaExpr;
			}
			else {
				updatedStatements[updatedCount++] = updatedStatement;
			}

			if (updatedStatement instanceof LocalDeclaration) {
				LocalDeclaration localDeclaration = (LocalDeclaration) updatedStatement;
				if(localDeclaration.declarationSourceEnd > lastEnd) {
					lastEnd = localDeclaration.declarationSourceEnd;

	// resize statement collection if necessary
	if (updatedCount != this.statementCount){
		this.blockDeclaration.statements = new Statement[updatedCount];
		System.arraycopy(updatedStatements, 0, this.blockDeclaration.statements, 0, updatedCount);
	} else {
		LambdaExpression lambda = null;
		if (lambdaExpressionExpected && (lambda = canGetLambdaExpression(updatedStatements, updatedCount)) != null) {
			Statement [] stmt = {lambda};
			this.blockDeclaration.statements = stmt;
		}
		else {
			this.blockDeclaration.statements = updatedStatements;
		}
	}

	if (this.blockDeclaration.sourceEnd == 0) {
		if(lastEnd < bodyEndValue) {
			this.blockDeclaration.sourceEnd = bodyEndValue;

		}
	}

	return this.blockDeclaration;
}
public LambdaExpression getLambdaExpression (Statement stmnt) {
	if (stmnt instanceof LambdaExpression) {
		return (LambdaExpression)stmnt;
	}
	else if (stmnt instanceof Block && ((Block)stmnt).statements[0] instanceof LambdaExpression) {
		return (LambdaExpression)((Block)stmnt).statements[0];
	}
	return null;
}
public LambdaExpression canGetLambdaExpression (Statement [] statementsArray, int count) {
	for (int indx = 0; indx < count - 1; indx++) {
		if (!(statementsArray[indx] instanceof Argument)) {
			return null;
		}
	}
	Argument [] arguments = new Argument [count-1];
	System.arraycopy(statementsArray, 0, arguments, 0, count-1);
	return new LambdaExpression(parser().compilationUnit.compilationResult, arguments, statementsArray[count-1]);
}
/*
 * Rebuild a statement from the nested structure which is in scope
 */
public Statement updatedStatement(int depth, Set knownTypes){

	return updatedBlock(depth, knownTypes);
}
public Statement updatedStatement(int depth, Set knownTypes, boolean lambdaExpressionExpected) {

	return lambdaExpressionExpected ? updatedBlock(depth, knownTypes, true) : updatedStatement(depth, knownTypes);
}
boolean lambdaExpressionInitializable(RecoveredStatement stmnt) {
	if (stmnt instanceof RecoveredLocalVariable) {
		RecoveredLocalVariable recLocVar = (RecoveredLocalVariable) stmnt;
		return recLocVar.localDeclaration != null && (recLocVar.localDeclaration.bits & ASTNode.IsInitializedByLamdaExpression) != 0;
	}
	return false;
}
/*
 * A closing brace got consumed, might have closed the current element,
 * in which case both the currentElement is exited
 */
public RecoveredElement updateOnClosingBrace(int braceStart, int braceEnd){

Lines 1-12 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredStatement.java (-1 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2013 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
		8	* This is an implementation of an early-draft specification developed under the Java
		9	* Community Process (JCP) and is made available for testing and evaluation purposes
		10	* only. The code is not compatible with any specification of the JCP.
		11	*
8	* Contributors:	12	* Contributors:
9	* IBM Corporation - initial API and implementation	13	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	14	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.parser;	15	package org.eclipse.jdt.internal.compiler.parser;
12		16
Lines 42-51 Link Here
42	return tabString(tab) + "Recovered statement:\n" + this.statement.print(tab + 1, new StringBuffer(10)); //$NON-NLS-1$	46	return tabString(tab) + "Recovered statement:\n" + this.statement.print(tab + 1, new StringBuffer(10)); //$NON-NLS-1$
43	}	47	}
44	public Statement updatedStatement(int depth, Set knownTypes){	48	public Statement updatedStatement(int depth, Set knownTypes){
45	return this.statement;	49	return this.statement;
46	}	50	}
		51	public Statement updatedStatement(int depth, Set knownTypes, boolean lambdaExpressionExpected) {
		52	return updatedStatement(depth, knownTypes);
		53	}
47	public void updateParseTree(){	54	public void updateParseTree(){
48	updatedStatement(0, new HashSet());	55	updatedStatement(0, new HashSet());
49	}	56	}
50	/*	57	/*
51	* Update the declarationSourceEnd of the corresponding parse node	58	* Update the declarationSourceEnd of the corresponding parse node




/*******************************************************************************
 * Copyright (c) 2000, 2013 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * This is an implementation of an early-draft specification developed under the Java
 * Community Process (JCP) and is made available for testing and evaluation purposes
 * only. The code is not compatible with any specification of the JCP.
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.core;


				new String(local.name),
				local.declarationSourceStart,
				local.declarationSourceEnd,
				local.sourceStart,
				local.sourceEnd,
				local.type == null ? Signature.createTypeSignature(local.binding.type.readableName(), false) : Util.typeSignature(local.type),
				local.annotations,
				local.modifiers,
				local.getKind() == AbstractVariableDeclaration.PARAMETER);
	}
	if (localVar != null) {

Return to bug 408230

Lines 1439-1448 Link Here

(-)a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java (+6 lines)
1439	this action is also performed when shifting token after recovery	1439	this action is also performed when shifting token after recovery
1440	got activated once.	1440	got activated once.
1441	*/	1441	*/
1442	recoveryTokenCheck();	1442	recoveryTokenCheck();
1443	}	1443	}
		1444	protected void consumeTypeElidedLambdaParameter(boolean parenthesized) {
		1445	if (this.astStack[this.astPtr] instanceof LocalDeclaration) {
		1446	this.astStack[this.astPtr].bits \|= ASTNode.IsInitializedByLamdaExpression;
		1447	}
		1448	super.consumeTypeElidedLambdaParameter(parenthesized);
		1449	}
1444		1450
1445	public String toString() {	1451	public String toString() {
1446	String s = Util.EMPTY_STRING;	1452	String s = Util.EMPTY_STRING;
1447	s = s + "elementKindStack : int[] = {"; //$NON-NLS-1$	1453	s = s + "elementKindStack : int[] = {"; //$NON-NLS-1$
1448	for (int i = 0; i <= this.elementPtr; i++) {	1454	for (int i = 0; i <= this.elementPtr; i++) {

Lines 41-51 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ASTNode.java (-1 / +2 lines)
41	public final static int Bit3 = 0x4; // return type (operator) \| name reference kind (name ref) \| implicit this (this ref) \| is argument(local)	41	public final static int Bit3 = 0x4; // return type (operator) \| name reference kind (name ref) \| implicit this (this ref) \| is argument(local)
42	public final static int Bit4 = 0x8; // return type (operator) \| first assignment to local (name ref,local decl) \| undocumented empty block (block, type and method decl)	42	public final static int Bit4 = 0x8; // return type (operator) \| first assignment to local (name ref,local decl) \| undocumented empty block (block, type and method decl)
43	public final static int Bit5 = 0x10; // value for return (expression) \| has all method bodies (unit) \| supertype ref (type ref) \| resolved (field decl)	43	public final static int Bit5 = 0x10; // value for return (expression) \| has all method bodies (unit) \| supertype ref (type ref) \| resolved (field decl)
44	public final static int Bit6 = 0x20; // depth (name ref, msg) \| ignore need cast check (cast expression) \| error in signature (method declaration/ initializer) \| is recovered (annotation reference)	44	public final static int Bit6 = 0x20; // depth (name ref, msg) \| ignore need cast check (cast expression) \| error in signature (method declaration/ initializer) \| is recovered (annotation reference)
45	public final static int Bit7 = 0x40; // depth (name ref, msg) \| operator (operator) \| need runtime checkcast (cast expression) \| label used (labelStatement) \| needFreeReturn (AbstractMethodDeclaration)	45	public final static int Bit7 = 0x40; // depth (name ref, msg) \| operator (operator) \| need runtime checkcast (cast expression) \| label used (labelStatement) \| needFreeReturn (AbstractMethodDeclaration)
46	public final static int Bit8 = 0x80; // depth (name ref, msg) \| operator (operator) \| unsafe cast (cast expression) \| is default constructor (constructor declaration) \| isElseStatementUnreachable (if statement)	46	public final static int Bit8 = 0x80; // depth (name ref, msg) \| operator (operator) \| unsafe cast (cast expression) \| is default constructor (constructor declaration) \| isElseStatementUnreachable (if statement) \| IsInitializedByLambdaExpression (local declaration)
47	public final static int Bit9 = 0x100; // depth (name ref, msg) \| operator (operator) \| is local type (type decl) \| isThenStatementUnreachable (if statement) \| can be static	47	public final static int Bit9 = 0x100; // depth (name ref, msg) \| operator (operator) \| is local type (type decl) \| isThenStatementUnreachable (if statement) \| can be static
48	public final static int Bit10= 0x200; // depth (name ref, msg) \| operator (operator) \| is anonymous type (type decl)	48	public final static int Bit10= 0x200; // depth (name ref, msg) \| operator (operator) \| is anonymous type (type decl)
49	public final static int Bit11 = 0x400; // depth (name ref, msg) \| operator (operator) \| is member type (type decl)	49	public final static int Bit11 = 0x400; // depth (name ref, msg) \| operator (operator) \| is member type (type decl)
50	public final static int Bit12 = 0x800; // depth (name ref, msg) \| operator (operator) \| has abstract methods (type decl)	50	public final static int Bit12 = 0x800; // depth (name ref, msg) \| operator (operator) \| has abstract methods (type decl)
51	public final static int Bit13 = 0x1000; // depth (name ref, msg) \| is secondary type (type decl)	51	public final static int Bit13 = 0x1000; // depth (name ref, msg) \| is secondary type (type decl)
Lines 126-135 Link Here
126	public static final int IsTypeElided = Bit2; // type elided lambda argument.	126	public static final int IsTypeElided = Bit2; // type elided lambda argument.
127	public static final int IsArgument = Bit3;	127	public static final int IsArgument = Bit3;
128	public static final int IsLocalDeclarationReachable = Bit31;	128	public static final int IsLocalDeclarationReachable = Bit31;
129	public static final int IsForeachElementVariable = Bit5;	129	public static final int IsForeachElementVariable = Bit5;
130	public static final int ShadowsOuterLocal = Bit22;	130	public static final int ShadowsOuterLocal = Bit22;
		131	public static final int IsInitializedByLamdaExpression = Bit8;
131		132
132	// for name refs or local decls	133	// for name refs or local decls
133	public static final int FirstAssignmentToLocal = Bit4;	134	public static final int FirstAssignmentToLocal = Bit4;
134		135
135	// for msg or field references	136	// for msg or field references

Lines 1-12 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java (-2 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2013 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
		8	* This is an implementation of an early-draft specification developed under the Java
		9	* Community Process (JCP) and is made available for testing and evaluation purposes
		10	* only. The code is not compatible with any specification of the JCP.
		11	*
8	* Contributors:	12	* Contributors:
9	* IBM Corporation - initial API and implementation	13	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	14	*******************************************************************************/
11	package org.eclipse.jdt.internal.core;	15	package org.eclipse.jdt.internal.core;
12		16
Lines 449-459 Link Here
449	new String(local.name),	453	new String(local.name),
450	local.declarationSourceStart,	454	local.declarationSourceStart,
451	local.declarationSourceEnd,	455	local.declarationSourceEnd,
452	local.sourceStart,	456	local.sourceStart,
453	local.sourceEnd,	457	local.sourceEnd,
454	Util.typeSignature(local.type),	458	local.type == null ? Signature.createTypeSignature(local.binding.type.readableName(), false) : Util.typeSignature(local.type),
455	local.annotations,	459	local.annotations,
456	local.modifiers,	460	local.modifiers,
457	local.getKind() == AbstractVariableDeclaration.PARAMETER);	461	local.getKind() == AbstractVariableDeclaration.PARAMETER);
458	}	462	}
459	if (localVar != null) {	463	if (localVar != null) {