Attachment #244766 for bug #333428





		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);

		codeComplete(cu, offset, collector);


		assertEquals(buf.toString(), doc.get());
	}

	public void testAnonymousTypeCompletion7() throws Exception {
		// bug 333428#c0 => button.addSelectionListener(new SelectionL
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");

		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runn\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();

		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);

		String str= "foo(new Runn";

		int offset= contents.indexOf(str) + str.length();

		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);

		codeComplete(cu, offset, collector);

		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();

		assertNumberOf("proposals", proposals.length, 1);

		IDocument doc= new Document(contents);

		proposals[0].apply(doc);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}

	public void testAnonymousTypeCompletion8() throws Exception {
		// bug 333428#c0 => button.addSelectionListener(new SelectionL)
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");

		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runn)\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();

		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);

		String str= "foo(new Runn";

		int offset= contents.indexOf(str) + str.length();

		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);

		codeComplete(cu, offset, collector);

		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();

		assertNumberOf("proposals", proposals.length, 1);

		IDocument doc= new Document(contents);

		proposals[0].apply(doc);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}


	public void testAnonymousTypeCompletion9() throws Exception {
		// bug 333428#c0 => button.addSelectionListener(new SelectionL);
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");

		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runn);\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();

		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);

		String str= "foo(new Runn";

		int offset= contents.indexOf(str) + str.length();

		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);

		codeComplete(cu, offset, collector);

		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();

		assertNumberOf("proposals", proposals.length, 1);

		IDocument doc= new Document(contents);

		proposals[0].apply(doc);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}

	public void testAnonymousTypeCompletion10() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");

		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private Runnable jobs[] = {\n");
		buf.append("    new Runn\n");
		buf.append("    };\n");
		buf.append("}\n");
		String contents= buf.toString();

		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);

		String str= "new Runn";

		int offset= contents.indexOf(str) + str.length();

		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);

		codeComplete(cu, offset, collector);

		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();

		assertNumberOf("proposals", proposals.length, 1);

		IDocument doc= new Document(contents);

		proposals[0].apply(doc);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private Runnable jobs[] = {\n");
		buf.append("    new Runnable() {\n");
		buf.append("        \n");
		buf.append("        public void run() {\n");
		buf.append("            //TODO\n");
		buf.append("            \n");
		buf.append("        }\n");
		buf.append("    }\n");
		buf.append("    };\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}

	

	public void testAnonymousTypeCompletion11() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");

		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private Runnable jobs[] = {new Runn}\n");
		buf.append("}\n");
		String contents= buf.toString();

		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);

		String str= "new Runn";

		int offset= contents.indexOf(str) + str.length();

		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);

		codeComplete(cu, offset, collector);

		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();

		assertNumberOf("proposals", proposals.length, 1);

		IDocument doc= new Document(contents);

		proposals[0].apply(doc);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private Runnable jobs[] = {new Runnable() {\n");
		buf.append("        \n");
		buf.append("        public void run() {\n");
		buf.append("            //TODO\n");
		buf.append("            \n");
		buf.append("        }\n");
		buf.append("    }};\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}

	public void testAnonymousTypeCompletion12() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");

		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runn)\n");
		buf.append("    	System.out.println();\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();

		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);

		String str= "foo(new Runn";

		int offset= contents.indexOf(str) + str.length();

		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);

		codeComplete(cu, offset, collector);

		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();

		assertNumberOf("proposals", proposals.length, 1);

		IDocument doc= new Document(contents);

		proposals[0].apply(doc);

		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("    public void bar() {\n");
		buf.append("    	foo(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        });\n");
		buf.append("    	System.out.println();\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}

	public void testAnonymousTypeCompletion13() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
	
		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private void foo() {\n");
		buf.append("        bar(new Runnable());\n");
		buf.append("    }\n");
		buf.append("    void bar(Runnable rs) {}\n");
		buf.append("}\n");
		String contents= buf.toString();
	
		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
	
		String str= "bar(new Runnable(";
	
		int offset= contents.indexOf(str) + str.length();
		System.out.println(contents.charAt(offset));
	
		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);
	
		codeComplete(cu, offset, collector);
	
		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();
	
		assertNumberOf("proposals", proposals.length, 1);
	
		IDocument doc= new Document(contents);
	
		proposals[0].apply(doc);
	
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private void foo() {\n");
		buf.append("        bar(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("    void bar(Runnable rs) {}\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}
	
	public void testAnonymousTypeCompletion14() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
	
		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private void foo() {\n");
		buf.append("        bar(new Runnable[] {\n");
		buf.append("                new Runnable(\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void bar(Runnable[] rs) {\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();
	
		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
	
		String str= "  new Runnable(";
	
		int offset= contents.indexOf(str) + str.length();
		System.out.println(contents.charAt(offset));
	
		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);
	
		codeComplete(cu, offset, collector);
	
		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();
	
		assertNumberOf("proposals", proposals.length, 1);
	
		IDocument doc= new Document(contents);
	
		proposals[0].apply(doc);
	
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("public class A {\n");
		buf.append("    private void foo() {\n");
		buf.append("        bar(new Runnable[] {\n");
		buf.append("                new Runnable() {\n");
		buf.append("                    \n");
		buf.append("                    public void run() {\n");
		buf.append("                        //TODO\n");
		buf.append("                        \n");
		buf.append("                    }\n");
		buf.append("                }\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    void bar(Runnable[] rs) {\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}
	
	public void testAnonymousTypeCompletion15() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
	
		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    public void bar() {\n");
		buf.append("        foo(new Runna\n");
		buf.append("                );\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();
	
		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
	
		String str= "foo(new Runna";
	
		int offset= contents.indexOf(str) + str.length();
		System.out.println(contents.charAt(offset));
	
		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);
	
		codeComplete(cu, offset, collector);
	
		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();
	
		assertNumberOf("proposals", proposals.length, 1);
	
		IDocument doc= new Document(contents);
	
		proposals[0].apply(doc);
	
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    public void bar() {\n");
		buf.append("        foo(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        }\n");
		buf.append("                );\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}
	
	public void testAnonymousTypeCompletion16() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
	
		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    public void bar() {\n");
		buf.append("        foo(new Runna\n");
		buf.append("                )\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();
	
		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
	
		String str= "foo(new Runna";
	
		int offset= contents.indexOf(str) + str.length();
		System.out.println(contents.charAt(offset));
	
		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);
	
		codeComplete(cu, offset, collector);
	
		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();
	
		assertNumberOf("proposals", proposals.length, 1);
	
		IDocument doc= new Document(contents);
	
		proposals[0].apply(doc);
	
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    public void bar() {\n");
		buf.append("        foo(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        }\n");
		buf.append("                );\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}
	
	public void testAnonymousTypeCompletion17() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
	
		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
		StringBuffer buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    public void bar() {\n");
		buf.append("        foo(new Runna\n");
		buf.append("                ;\n");
		buf.append("    }\n");
		buf.append("}\n");
		String contents= buf.toString();
	
		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
	
		String str= "foo(new Runna";
	
		int offset= contents.indexOf(str) + str.length();
		System.out.println(contents.charAt(offset));
	
		CompletionProposalCollector collector= createCollector(cu, offset);
		collector.setReplacementLength(0);
		collector.setAllowsRequiredProposals(CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, CompletionProposal.TYPE_REF, true);
	
		codeComplete(cu, offset, collector);
	
		IJavaCompletionProposal[] proposals= collector.getJavaCompletionProposals();
	
		assertNumberOf("proposals", proposals.length, 1);
	
		IDocument doc= new Document(contents);
	
		proposals[0].apply(doc);
	
		buf= new StringBuffer();
		buf.append("package test1;\n");
		buf.append("\n");
		buf.append("public class A {\n");
		buf.append("    public void foo(Runnable r) {\n");
		buf.append("    }\n");
		buf.append("\n");
		buf.append("    public void bar() {\n");
		buf.append("        foo(new Runnable() {\n");
		buf.append("            \n");
		buf.append("            public void run() {\n");
		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        })\n");
		buf.append("                ;\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals(buf.toString(), doc.get());
	}

	public void testAnonymousTypeCompletionBug280801() throws Exception {
		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");


		buf.append("                //TODO\n");
		buf.append("                \n");
		buf.append("            }\n");
		buf.append("        });\n");
		buf.append("    }\n");
		buf.append("}\n");
		assertEquals("", buf.toString(), doc.get());

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/AnonymousTypeCompletionProposal.java (-16 / +95 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2014 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
Lines 71-76 Link Here
71	import org.eclipse.jdt.internal.ui.dialogs.OverrideMethodDialog;	71	import org.eclipse.jdt.internal.ui.dialogs.OverrideMethodDialog;
72	import org.eclipse.jdt.internal.ui.javaeditor.ASTProvider;	72	import org.eclipse.jdt.internal.ui.javaeditor.ASTProvider;
73	import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;	73	import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
		74	import org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner;
		75	import org.eclipse.jdt.internal.ui.text.Symbols;
74		76
75		77
76	public class AnonymousTypeCompletionProposal extends JavaTypeCompletionProposal implements ICompletionProposalExtension4 {	78	public class AnonymousTypeCompletionProposal extends JavaTypeCompletionProposal implements ICompletionProposalExtension4 {
Lines 82-88 Link Here
82	private int fContextInformationPosition;	84	private int fContextInformationPosition;
83		85
84	private ImportRewrite fImportRewrite;	86	private ImportRewrite fImportRewrite;
85		87
		88	private final String SEMICOLON= ";"; //$NON-NLS-1$
		89	private final String ESCAPE_CHAR= "\r"; //$NON-NLS-1$
86		90
87	public AnonymousTypeCompletionProposal(IJavaProject jproject, ICompilationUnit cu, JavaContentAssistInvocationContext invocationContext, int start, int length, String constructorCompletion, StyledString displayName, String declarationSignature, IType superType, int relevance) {	91	public AnonymousTypeCompletionProposal(IJavaProject jproject, ICompilationUnit cu, JavaContentAssistInvocationContext invocationContext, int start, int length, String constructorCompletion, StyledString displayName, String declarationSignature, IType superType, int relevance) {
88	super(constructorCompletion, cu, start, length, null, displayName, relevance, null, invocationContext);	92	super(constructorCompletion, cu, start, length, null, displayName, relevance, null, invocationContext);
Lines 371-377 Link Here
371	if (newBody == null)	375	if (newBody == null)
372	return false;	376	return false;
373		377
374	CompletionProposal coreProposal= ((MemberProposalInfo)getProposalInfo()).fProposal;	378	CompletionProposal coreProposal= ((MemberProposalInfo) getProposalInfo()).fProposal;
375	boolean isAnonymousConstructorInvoc= coreProposal.getKind() == CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION;	379	boolean isAnonymousConstructorInvoc= coreProposal.getKind() == CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION;
376		380
377	boolean replacementStringEndsWithParentheses= isAnonymousConstructorInvoc \|\| getReplacementString().endsWith(")"); //$NON-NLS-1$	381	boolean replacementStringEndsWithParentheses= isAnonymousConstructorInvoc \|\| getReplacementString().endsWith(")"); //$NON-NLS-1$
Lines 392-412 Link Here
392	options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_EMPTY_LINES, DefaultCodeFormatterConstants.TRUE);	396	options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_EMPTY_LINES, DefaultCodeFormatterConstants.TRUE);
393	String replacementString= CodeFormatterUtil.format(CodeFormatter.K_EXPRESSION, buf.toString(), 0, lineDelim, options);	397	String replacementString= CodeFormatterUtil.format(CodeFormatter.K_EXPRESSION, buf.toString(), 0, lineDelim, options);
394		398
395	int lineEndOffset= lineInfo.getOffset() + lineInfo.getLength();	399	JavaHeuristicScanner scanner= new JavaHeuristicScanner(document);
		400	IRegion region= scanner.findSurroundingBlock(lineInfo.getOffset());
		401	int surroundingBlockBound= region.getOffset() + region.getLength();
396		402
397	int p= offset;	403	int p= offset;
398	char ch= document.getChar(p);	404	char ch= document.getChar(p);
399	while (p < lineEndOffset) {	405	while (p < surroundingBlockBound) {
400	if (ch == '(' \|\| ch == ')' \|\| ch == ';' \|\| ch == ',')	406	if (ch == '(' \|\| ch == ')' \|\| ch == ';' \|\| ch == ',')
401	break;	407	break;
402	ch= document.getChar(++p);	408	ch= document.getChar(++p);
403	}	409	}
404		410
405	if (ch != ';' && ch != ',' && ch != ')')	411	String closingString= getMatchingClosingSymbols(document, offset, lineInfo.getOffset(), lineInfo.getLength());
		412	if (closingString.length() != 0 && !ESCAPE_CHAR.equals(closingString)) {
		413	if (ch != ';' && ch != ',' && ch != ')') {
		414	replacementString= replacementString + closingString + ';';
		415	} else {
		416	replacementString= replacementString + closingString;
		417	}
		418	}
		419	if (closingString.length() == 0 && ch != ';' && ch != ',' && ch != ')' && ch != '}')
406	replacementString= replacementString + ';';	420	replacementString= replacementString + ';';
407		421
408	replacementString= Strings.changeIndent(replacementString, 0, project, CodeFormatterUtil.createIndentString(indent, project), lineDelim);	422	replacementString= Strings.changeIndent(replacementString, 0, project, CodeFormatterUtil.createIndentString(indent, project), lineDelim);
409		423
410	int beginIndex= replacementString.indexOf('(');	424	int beginIndex= replacementString.indexOf('(');
411	if (!isAnonymousConstructorInvoc)	425	if (!isAnonymousConstructorInvoc)
412	beginIndex++;	426	beginIndex++;
Lines 417-434 Link Here
417	// Keep existing code	431	// Keep existing code
418	int endPos= pos;	432	int endPos= pos;
419	ch= document.getChar(endPos);	433	ch= document.getChar(endPos);
		434	int lineEndOffset= lineInfo.getOffset() + lineInfo.getLength();
420	while (endPos < lineEndOffset && ch != '(' && ch != ')' && ch != ';' && ch != ',' && !Character.isWhitespace(ch))	435	while (endPos < lineEndOffset && ch != '(' && ch != ')' && ch != ';' && ch != ',' && !Character.isWhitespace(ch))
421	ch= document.getChar(++endPos);	436	ch= document.getChar(++endPos);
422		437
423	int keepLength= endPos - pos;	438	}
424	if (keepLength > 0) {	439	setCursorPosition(replacementString.length());
425	String keepStr= document.get(pos, keepLength);
426	replacementString= replacementString + keepStr;
427	setCursorPosition(replacementString.length() - keepLength);
428	}
429	} else
430	setCursorPosition(replacementString.length());
431
432	setReplacementString(replacementString);	440	setReplacementString(replacementString);
433		441
434	if (pos < document.getLength() && document.getChar(pos) == ')') {	442	if (pos < document.getLength() && document.getChar(pos) == ')') {
Lines 441-446 Link Here
441	return false;	449	return false;
442	}	450	}
443		451
		452	private String getMatchingClosingSymbols(IDocument doc, int currentOffset, int lineOffset, int bound) throws BadLocationException {
		453	String lineUnderModification= doc.get(lineOffset, bound);
		454	char[] charArray= lineUnderModification.toCharArray();
		455	String returnChar= ""; //$NON-NLS-1$
		456	JavaHeuristicScanner scanner= new JavaHeuristicScanner(doc);
		457	IRegion region= scanner.findSurroundingBlock(lineOffset);
		458	int surroundingBlockBound= region.getOffset() + region.getLength();
		459
		460	for (int i= 0; i < charArray.length; i++) {
		461	char c= charArray[i];
		462	if (c == '(' \|\| c == '{') {
		463	char closingChar= getClosingChar(c);
		464	if (c == '(' && lineOffset + i + 1 == currentOffset)
		465	continue;
		466	int scanForward= scanner.findClosingPeer(lineOffset + i + 1, surroundingBlockBound, c, closingChar);
		467	if (scanForward == -1) {
		468	returnChar= closingChar + returnChar;
		469	}
		470	}
		471	}
		472
		473	int nextToken1= scanner.nextToken(currentOffset, surroundingBlockBound);
		474	if (nextToken1 != -1) {
		475	int position= scanner.getPosition();
		476	// make sure we do not set the bound more than the document length
		477	if (surroundingBlockBound + 1 < doc.getLength())
		478	surroundingBlockBound++;
		479	int nextToken2= scanner.nextToken(position, surroundingBlockBound);
		480	if (nextToken2 != -1) {
		481	// e.g. foo(new Run\|, null) or new Run\|; or Runnable run= new Runnable(\|); or Runnable jobs[] = {new Run\|};
		482	if (Symbols.TokenCOMMA == nextToken1 \|\| Symbols.TokenSEMICOLON == nextToken1 \|\|
		483	((Symbols.TokenRBRACE == nextToken1 \|\| Symbols.TokenRPAREN == nextToken1) && Symbols.TokenSEMICOLON == nextToken2) \|\|
		484	(Symbols.TokenRBRACE == nextToken1 && Symbols.TokenRPAREN == nextToken2)) {
		485	// No need to append semicolon as the code already has a ';' or ','
		486	return returnChar.length() != 0 ? returnChar : ESCAPE_CHAR;
		487	}
		488
		489	if (Symbols.TokenRBRACE == nextToken1 && Symbols.TokenRPAREN == nextToken2) {
		490	return ESCAPE_CHAR;
		491	}
		492
		493	// e.g. Runnable jobs[] = {new Runn}
		494	// We have to append semicolon, but not as part of the replacement string.
		495	if (Symbols.TokenRBRACE == nextToken1) {
		496	doc.replace(position, 0, SEMICOLON);
		497	return ESCAPE_CHAR;
		498	}
		499	}
		500
		501	// We have to append semicolon, but not as part of the replacement string.
		502	if (Symbols.TokenRPAREN == nextToken1 && !lineUnderModification.trim().endsWith(SEMICOLON)) {
		503	doc.replace(position, 0, SEMICOLON);
		504	return ESCAPE_CHAR;
		505	}
		506	}
		507	return returnChar;
		508	}
		509
		510	private char getClosingChar(char c) {
		511	switch (c) {
		512	case '(':
		513	return ')';
		514
		515	case '{':
516	return '}';
517
518	default:
519	return '\0';
520	}
521	}
522
444	/*	523	/*
445	* @see ICompletionProposalExtension#getContextInformationPosition()	524	* @see ICompletionProposalExtension#getContextInformationPosition()
446	* @since 3.4	525	* @since 3.4

Return to bug 333428