Attachment #243417 for bug #421479




		return new Java18ProjectTestSetup(test);
	}

	@Override
	protected void setUp() throws Exception {
		Hashtable options= TestOptions.getDefaultOptions();
		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);

		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
	}

	@Override
	protected void tearDown() throws Exception {
		JavaProjectHelper.clear(fJProject1, Java18ProjectTestSetup.getDefaultClasspath());
	}

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda19() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func2 {\n");
		buf.append("    enum En {\n");
		buf.append("        A, B;\n");
		buf.append("        enum COLOR {\n");
		buf.append("            D, E\n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void foo();\n");
		buf.append("\n");
		buf.append("    String NAME = \"\";\n");
		buf.append("\n");
		buf.append("    static String staticName() {\n");
		buf.append("        return NAME;\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test2 {\n");
		buf.append("    void bar() {\n");
		buf.append("        Func2 f = new Func2() {\n");
		buf.append("            @Override\n");
		buf.append("            public void foo() {\n");
		buf.append("                System.out.println(NAME);\n");
		buf.append("                System.out.println(Func2.NAME);\n");
		buf.append("                System.out.println(En.A);\n");
		buf.append("                System.out.println(Func2.En.A);\n");
		buf.append("                System.out.println(En.COLOR.D);\n");
		buf.append("                System.out.println(Func2.En.COLOR.D);\n");
		buf.append("                System.out.println(Test2.this);\n");
		buf.append("                bar();\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Func2.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 1);
		assertCorrectLabels(proposals);

		buf= new StringBuffer();
		buf.append("package test1;\n\n");
		buf.append("import test1.Func2.En;\n\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func2 {\n");
		buf.append("    enum En {\n");
		buf.append("        A, B;\n");
		buf.append("        enum COLOR {\n");
		buf.append("            D, E\n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void foo();\n");
		buf.append("\n");
		buf.append("    String NAME = \"\";\n");
		buf.append("\n");
		buf.append("    static String staticName() {\n");
		buf.append("        return NAME;\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test2 {\n");
		buf.append("    void bar() {\n");
		buf.append("        Func2 f = () -> {\n");
		buf.append("            System.out.println(Func2.NAME);\n");
		buf.append("            System.out.println(Func2.NAME);\n");
		buf.append("            System.out.println(Func2.En.A);\n");
		buf.append("            System.out.println(Func2.En.A);\n");
		buf.append("            System.out.println(En.COLOR.D);\n");
		buf.append("            System.out.println(Func2.En.COLOR.D);\n");
		buf.append("            System.out.println(Test2.this);\n");
		buf.append("            bar();\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		String expected1= buf.toString();

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda20() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("interface Func<T> {\n");
		buf.append("    void go();\n");
		buf.append("    String NAME = Func.class.getName();\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("public class Test {\n");
		buf.append("    void foo() {\n");
		buf.append("        Func<String> f= new Func<String>() {\n");
		buf.append("            @Override\n");
		buf.append("            public void go() {\n");
		buf.append("                System.out.println(NAME);\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Test.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 1);
		assertCorrectLabels(proposals);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("interface Func<T> {\n");
		buf.append("    void go();\n");
		buf.append("    String NAME = Func.class.getName();\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("public class Test {\n");
		buf.append("    void foo() {\n");
		buf.append("        Func<String> f= () -> System.out.println(Func.NAME);\n");
		buf.append("    }\n");
		buf.append("}\n");
		String expected1= buf.toString();

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda21() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("import test1.Func2.En.COLOR;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func2 {\n");
		buf.append("    enum En {\n");
		buf.append("        A, B;\n");
		buf.append("        enum COLOR {\n");
		buf.append("            D, E\n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void foo();\n");
		buf.append("\n");
		buf.append("    String NAME = \"\";\n");
		buf.append("\n");
		buf.append("    static String staticName() {\n");
		buf.append("        return NAME;\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test2 {\n");
		buf.append("    void bar() {\n");
		buf.append("        Func2 f = new Func2() {\n");
		buf.append("            @Override\n");
		buf.append("            public void foo() {\n");
		buf.append("                System.out.println(COLOR.D);\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Func2.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 1);
		assertCorrectLabels(proposals);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("import test1.Func2.En.COLOR;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func2 {\n");
		buf.append("    enum En {\n");
		buf.append("        A, B;\n");
		buf.append("        enum COLOR {\n");
		buf.append("            D, E\n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void foo();\n");
		buf.append("\n");
		buf.append("    String NAME = \"\";\n");
		buf.append("\n");
		buf.append("    static String staticName() {\n");
		buf.append("        return NAME;\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test2 {\n");
		buf.append("    void bar() {\n");
		buf.append("        Func2 f = () -> System.out.println(COLOR.D);\n");
		buf.append("    }\n");
		buf.append("}\n");
		String expected1= buf.toString();

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda22() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("import test1.Func2.En.*;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func2 {\n");
		buf.append("    enum En {\n");
		buf.append("        A, B;\n");
		buf.append("        enum COLOR {\n");
		buf.append("            D, E\n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void foo();\n");
		buf.append("\n");
		buf.append("    String NAME = \"\";\n");
		buf.append("\n");
		buf.append("    static String staticName() {\n");
		buf.append("        return NAME;\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test2 {\n");
		buf.append("    void bar() {\n");
		buf.append("        Func2 f = new Func2() {\n");
		buf.append("            @Override\n");
		buf.append("            public void foo() {\n");
		buf.append("                System.out.println(COLOR.D);\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Func2.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 1);
		assertCorrectLabels(proposals);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("import test1.Func2.En.*;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func2 {\n");
		buf.append("    enum En {\n");
		buf.append("        A, B;\n");
		buf.append("        enum COLOR {\n");
		buf.append("            D, E\n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void foo();\n");
		buf.append("\n");
		buf.append("    String NAME = \"\";\n");
		buf.append("\n");
		buf.append("    static String staticName() {\n");
		buf.append("        return NAME;\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test2 {\n");
		buf.append("    void bar() {\n");
		buf.append("        Func2 f = () -> System.out.println(COLOR.D);\n");
		buf.append("    }\n");
		buf.append("}\n");
		String expected1= buf.toString();

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda23() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func {\n");
		buf.append("    class C {\n");
		buf.append("        static  class CIn { static int i= 0; }        \n");
		buf.append("        static String NAME = \"\";\n");
		buf.append("    }\n");
		buf.append("    void foo();\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test {\n");
		buf.append("    static class C {\n");
		buf.append("        static  class CIn { static int i= 1; }        \n");
		buf.append("        static String NAME = \"\";\n");
		buf.append("    }\n");
		buf.append("    void bar() {\n");
		buf.append("        Func f = new Func() {\n");
		buf.append("            @Override\n");
		buf.append("            public void foo() {\n");
		buf.append("                System.out.println(C.CIn.i);\n");
		buf.append("                System.out.println(C.NAME);\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Func.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 1);
		assertCorrectLabels(proposals);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func {\n");
		buf.append("    class C {\n");
		buf.append("        static  class CIn { static int i= 0; }        \n");
		buf.append("        static String NAME = \"\";\n");
		buf.append("    }\n");
		buf.append("    void foo();\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test {\n");
		buf.append("    static class C {\n");
		buf.append("        static  class CIn { static int i= 1; }        \n");
		buf.append("        static String NAME = \"\";\n");
		buf.append("    }\n");
		buf.append("    void bar() {\n");
		buf.append("        Func f = () -> {\n");
		buf.append("            System.out.println(test1.Func.C.CIn.i);\n");
		buf.append("            System.out.println(Func.C.NAME);\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		String expected1= buf.toString();

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda24() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func {\n");
		buf.append("    class C {\n");
		buf.append("        static  class CIn { static int i= 0; }        \n");
		buf.append("    }\n");
		buf.append("    void foo();\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test extends TT {\n");
		buf.append("    static class C {\n");
		buf.append("        static  class CIn { static int i= 1; }        \n");
		buf.append("    }\n");
		buf.append("    void bar() {\n");
		buf.append("        test1.Func f = new test1.Func() {\n");
		buf.append("            @Override\n");
		buf.append("            public void foo() {\n");
		buf.append("                System.out.println(C.CIn.i); // [1]\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class TT {\n");
		buf.append("    class Func {\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Func.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 1);
		assertCorrectLabels(proposals);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func {\n");
		buf.append("    class C {\n");
		buf.append("        static  class CIn { static int i= 0; }        \n");
		buf.append("    }\n");
		buf.append("    void foo();\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test extends TT {\n");
		buf.append("    static class C {\n");
		buf.append("        static  class CIn { static int i= 1; }        \n");
		buf.append("    }\n");
		buf.append("    void bar() {\n");
		buf.append("        test1.Func f = () -> System.out.println(test1.Func.C.CIn.i);\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class TT {\n");
		buf.append("    class Func {\n");
		buf.append("    }\n");
		buf.append("}\n");
		String expected1= buf.toString();

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda25() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface FI extends FIS {\n");
		buf.append("    void run(int x);\n");
		buf.append("    public static void test(int e) {\n");
		buf.append("        FI fi = new FI() {\n");
		buf.append("            @Override\n");
		buf.append("            public void run(int x) {\n");
		buf.append("                System.out.println(e);\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("        fi.run(e);\n");
		buf.append("    }            \n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("interface FIS {\n");
		buf.append("    int e= 0;    \n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("FI.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 1);
		assertCorrectLabels(proposals);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface FI extends FIS {\n");
		buf.append("    void run(int x);\n");
		buf.append("    public static void test(int e) {\n");
		buf.append("        FI fi = x -> System.out.println(FIS.e);\n");
		buf.append("        fi.run(e);\n");
		buf.append("    }            \n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("interface FIS {\n");
		buf.append("    int e= 0;    \n");
		buf.append("}\n");
		String expected1= buf.toString();

		assertExpectedExistInProposals(proposals, new String[] { expected1 });
	}

	// Bug 421479
	public void testConvertToLambda26() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("@FunctionalInterface\n");
		buf.append("interface Func2 {\n");
		buf.append("    enum En {\n");
		buf.append("        A, B\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void foo();\n");
		buf.append("\n");
		buf.append("    String NAME = \"\";\n");
		buf.append("\n");
		buf.append("    static String staticName() {\n");
		buf.append("        return NAME;\n");
		buf.append("    }\n");
		buf.append("}\n");
		buf.append("\n");
		buf.append("class Test2 {\n");
		buf.append("    void bar() {\n");
		buf.append("        Func2 f = new Func2() {\n");
		buf.append("            @Override\n");
		buf.append("            public void foo() {\n");
		buf.append("                foo();\n");
		buf.append("            }\n");
		buf.append("        };\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Func2.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 0);
	}

	// Bug 421479
	public void testConvertToLambda27() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("import java.util.function.Consumer;\n");
		buf.append("\n");
		buf.append("public class Test {\n");
		buf.append("    static void run(Consumer<Integer> consumer) {\n");
		buf.append("        System.out.println(\"consumer\");\n");
		buf.append("    }\n");
		buf.append("    static {\n");
		buf.append("        run(new Consumer<Integer>() {\n");
		buf.append("            @Override\n");
		buf.append("            public void accept(Integer integer) {\n");
		buf.append("                System.out.println(andThen(null));\n");
		buf.append("            }\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("}\n");
		ICompilationUnit cu= pack1.createCompilationUnit("Test.java", buf.toString(), false, null);

		int offset= buf.toString().indexOf("public void");
		AssistContext context= getCorrectionContext(cu, offset, 0);
		assertNoErrors(context);
		List proposals= collectAssists(context, false);

		assertNumberOfProposals(proposals, 0);
	}

	public void testConvertToLambdaAmbiguousOverridden() throws Exception {
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();

Lines 36-46 Link Here

(-)core extension/org/eclipse/jdt/internal/corext/fix/LambdaExpressionsFix.java (-5 / +92 lines)
36	import org.eclipse.jdt.core.dom.IBinding;	36	import org.eclipse.jdt.core.dom.IBinding;
37	import org.eclipse.jdt.core.dom.IMethodBinding;	37	import org.eclipse.jdt.core.dom.IMethodBinding;
38	import org.eclipse.jdt.core.dom.ITypeBinding;	38	import org.eclipse.jdt.core.dom.ITypeBinding;
		39	import org.eclipse.jdt.core.dom.IVariableBinding;
39	import org.eclipse.jdt.core.dom.LambdaExpression;	40	import org.eclipse.jdt.core.dom.LambdaExpression;
40	import org.eclipse.jdt.core.dom.MethodDeclaration;	41	import org.eclipse.jdt.core.dom.MethodDeclaration;
41	import org.eclipse.jdt.core.dom.MethodInvocation;	42	import org.eclipse.jdt.core.dom.MethodInvocation;
		43	import org.eclipse.jdt.core.dom.Name;
		44	import org.eclipse.jdt.core.dom.QualifiedName;
42	import org.eclipse.jdt.core.dom.ReturnStatement;	45	import org.eclipse.jdt.core.dom.ReturnStatement;
43	import org.eclipse.jdt.core.dom.SimpleName;	46	import org.eclipse.jdt.core.dom.SimpleName;
		47	import org.eclipse.jdt.core.dom.SimpleType;
44	import org.eclipse.jdt.core.dom.SingleVariableDeclaration;	48	import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
45	import org.eclipse.jdt.core.dom.Statement;	49	import org.eclipse.jdt.core.dom.Statement;
46	import org.eclipse.jdt.core.dom.SuperFieldAccess;	50	import org.eclipse.jdt.core.dom.SuperFieldAccess;
Lines 61-66 Link Here
61	import org.eclipse.jdt.internal.corext.dom.Bindings;	65	import org.eclipse.jdt.internal.corext.dom.Bindings;
62	import org.eclipse.jdt.internal.corext.dom.HierarchicalASTVisitor;	66	import org.eclipse.jdt.internal.corext.dom.HierarchicalASTVisitor;
63	import org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder;	67	import org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder;
		68	import org.eclipse.jdt.internal.corext.dom.TypeRules;
64	import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;	69	import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
65	import org.eclipse.jdt.internal.corext.refactoring.structure.ImportRemover;	70	import org.eclipse.jdt.internal.corext.refactoring.structure.ImportRemover;
66	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;	71	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
Lines 71-76 Link Here
71	import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;	76	import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
72		77
73	public class LambdaExpressionsFix extends CompilationUnitRewriteOperationsFix {	78	public class LambdaExpressionsFix extends CompilationUnitRewriteOperationsFix {
		79
		80	private static final class InterfaceAccessQualifier extends HierarchicalASTVisitor {
		81
		82	private ClassInstanceCreation classInstanceCreation;
		83
		84	private ITypeBinding typeBinding;
		85
		86	private CompilationUnitRewrite cuRewrite;
		87
		88	private TextEditGroup categorizedGroup;
		89
		90	public InterfaceAccessQualifier(CompilationUnitRewrite rewrite, ClassInstanceCreation classInstance, TextEditGroup group) {
		91	this.classInstanceCreation= classInstance;
		92	this.typeBinding= classInstanceCreation.getType().resolveBinding();
		93	this.cuRewrite= rewrite;
		94	this.categorizedGroup= group;
		95	}
		96
		97	@Override
		98	public boolean visit(SimpleName node) {
		99	IBinding resolveBinding= node.resolveBinding();
		100	ITypeBinding declaringClass= null;
		101	if (resolveBinding instanceof IVariableBinding) {
		102	declaringClass= ((IVariableBinding) resolveBinding).getDeclaringClass();
		103	} else if (resolveBinding instanceof ITypeBinding) {
		104	declaringClass= ((ITypeBinding) resolveBinding).getDeclaringClass();
		105	}
		106	if (declaringClass != null && (Bindings.equals(typeBinding, declaringClass) \|\| TypeRules.canAssign(typeBinding, declaringClass))) {
		107	ASTRewrite rewrite= cuRewrite.getASTRewrite();
		108	String qualifier= declaringClass.getErasure().getName();
		109	AST ast= cuRewrite.getAST();
		110	SimpleName simpleName= ast.newSimpleName(node.getIdentifier());
		111	rewrite.set(node, SimpleName.IDENTIFIER_PROPERTY, ast.newQualifiedName(ast.newName(qualifier), simpleName).getFullyQualifiedName(), categorizedGroup);
		112	}
		113	return true;
		114	}
		115
		116	@Override
		117	public boolean visit(QualifiedName node) {
		118	Name qualifier= node.getQualifier();
		119	if (qualifier instanceof SimpleName) {
		120	// Ignore if already qualified with the functional interface
		121	if (Bindings.equals(typeBinding, qualifier.resolveBinding()))
		122	return false;
		123	return true;
		124	}
		125	// Ignore if already qualified with the functional interface
		126	IBinding qualifierBinding= ASTNodes.getLeftMostSimpleName(qualifier).resolveBinding();
		127	if (qualifierBinding == null \|\| Bindings.equals(typeBinding, qualifierBinding)) {
		128	return false;
		129	}
		130
		131	IBinding resolveBinding= node.resolveBinding();
		132	ITypeBinding declaringClass= null;
		133	if (resolveBinding instanceof IVariableBinding) {
		134	declaringClass= ((IVariableBinding) resolveBinding).getDeclaringClass();
		135	} else if (resolveBinding instanceof ITypeBinding) {
		136	declaringClass= ((ITypeBinding) resolveBinding).getDeclaringClass();
		137	}
		138	while (declaringClass != null) {
		139	if (Bindings.equals(typeBinding, declaringClass) && qualifierBinding instanceof ITypeBinding) {
		140	ImportRewrite importRewrite= cuRewrite.getImportRewrite();
		141	ImportRewriteContext importRewriteContext= new ContextSensitiveImportRewriteContext(classInstanceCreation, importRewrite);
		142	Type addImport= importRewrite.addImport((ITypeBinding) qualifierBinding, cuRewrite.getAST(), importRewriteContext);
143	ImportRemover importRemover= cuRewrite.getImportRemover();
144	importRemover.registerAddedImports(addImport);
145	if (addImport instanceof SimpleType) {
146	Name qualifiedName= ((SimpleType) addImport).getName();
147	if (qualifiedName instanceof QualifiedName && qualifier instanceof QualifiedName) {
148	ASTRewrite rewrite= cuRewrite.getASTRewrite();
149	rewrite.set(qualifier, QualifiedName.QUALIFIER_PROPERTY, qualifiedName, categorizedGroup);
150	}
151	}
152	return false;
153	}
154	declaringClass= declaringClass.getDeclaringClass();
155	}
156	return false;
157	}
158	}
74		159
75	private static final class FunctionalAnonymousClassesFinder extends ASTVisitor {	160	private static final class FunctionalAnonymousClassesFinder extends ASTVisitor {
76		161
Lines 176-183 Link Here
176	@Override	261	@Override
177	public boolean visit(MethodInvocation node) {	262	public boolean visit(MethodInvocation node) {
178	IMethodBinding binding= node.resolveMethodBinding();	263	IMethodBinding binding= node.resolveMethodBinding();
179	if (binding != null && !JdtFlags.isStatic(binding) && node.getExpression() == null	264	if (binding != null
180	&& Bindings.isSuperType(binding.getDeclaringClass(), fFunctionalInterface, false))	265	&& ((!JdtFlags.isStatic(binding) && node.getExpression() == null && Bindings.isSuperType(binding.getDeclaringClass(), fFunctionalInterface, true))
		266	\|\| (Bindings.equals(binding, fMethodDeclaration.resolveBinding()))))
181	throw new AbortSearchException();	267	throw new AbortSearchException();
182	return true;	268	return true;
183	}	269	}
Lines 250-257 Link Here
250	}	336	}
251	}	337	}
252	}	338	}
253	//TODO: Bug 421479: [1.8][clean up][quick assist] convert anonymous to lambda must consider lost scope of interface	339
254	// lambdaBody.accept(new InterfaceAccessQualifier(rewrite, classInstanceCreation.getType().resolveBinding())); //TODO: maybe need a separate ASTRewrite and string placeholder	340	// Qualify the lost scope of the interface
		341	lambdaBody.accept(new InterfaceAccessQualifier(cuRewrite, classInstanceCreation, group));
255		342
256	lambdaExpression.setBody(rewrite.createCopyTarget(lambdaBody));	343	lambdaExpression.setBody(rewrite.createCopyTarget(lambdaBody));
257	Expression replacement= lambdaExpression;	344	Expression replacement= lambdaExpression;
Lines 547-553 Link Here
547	return methodBinding.getReturnType().getFunctionalInterfaceMethod() != null;	634	return methodBinding.getReturnType().getFunctionalInterfaceMethod() != null;
548	}	635	}
549		636
550	//TODO: should also check whether variable is of a functional type	637	//TODO: should also check whether variable is of a functional type
551	return locationInParent == SingleVariableDeclaration.INITIALIZER_PROPERTY	638	return locationInParent == SingleVariableDeclaration.INITIALIZER_PROPERTY
552	\|\| locationInParent == VariableDeclarationFragment.INITIALIZER_PROPERTY	639	\|\| locationInParent == VariableDeclarationFragment.INITIALIZER_PROPERTY
553	\|\| locationInParent == Assignment.RIGHT_HAND_SIDE_PROPERTY	640	\|\| locationInParent == Assignment.RIGHT_HAND_SIDE_PROPERTY

Return to bug 421479