Only filter types from completion

Signed-off-by: Fred Bricon <[email protected]>
eclipse-jdtls · Oct 16, 2019 · 0fc3034 · 0fc3034
1 parent 50aa600
commit 0fc3034
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/....core/src/org/eclipse/jdt/ls/core/internal/contentassist/CompletionProposalRequestor.java b/....core/src/org/eclipse/jdt/ls/core/internal/contentassist/CompletionProposalRequestor.java
@@ -307,8 +307,19 @@ protected boolean isFiltered(CompletionProposal proposal) {
 		if (isIgnored(proposal.getKind())) {
 			return true;
 		}
-		char[] declaringType = getDeclaringType(proposal);
-		return declaringType != null && TypeFilter.isFiltered(declaringType);
+		// Only filter types and constructors from completion.
+		// Methods from already imported types and packages can still be proposed.
+		// See https://github.com/eclipse/eclipse.jdt.ls/issues/1212
+		switch (proposal.getKind()) {
+			case CompletionProposal.CONSTRUCTOR_INVOCATION:
+			case CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION:
+			case CompletionProposal.JAVADOC_TYPE_REF:
+			case CompletionProposal.TYPE_REF: {
+				char[] declaringType = getDeclaringType(proposal);
+				return declaringType != null && TypeFilter.isFiltered(declaringType);
+			}
+		}
+		return false;
 	}
 
 	/**

diff --git a/...pse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionHandlerTest.java b/...pse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionHandlerTest.java
@@ -2524,6 +2524,33 @@ public void testCompletion_FilterTypes() throws JavaModelException {
 		}
 	}
 
+	@Test
+	public void testCompletion_FilterTypesKeepMethods() throws JavaModelException {
+		ICompilationUnit unit = getWorkingCopy("src/org/sample/Test.java",
+		//@formatter:off
+				"package org.sample;\n"
+			+	"public class Test {\n\n"
+			+	"	void test() {\n\n"
+			+	"		java.util.List l; \n"
+			+   "       l.clea \n"
+			+	"	}\n"
+			+	"}\n");
+		//@formatter:on
+		int[] loc = findCompletionLocation(unit, "l.clea");
+		try {
+			List<String> filteredTypes = new ArrayList<>();
+			filteredTypes.add("java.util.*");
+			PreferenceManager.getPrefs(null).setFilteredTypes(filteredTypes);
+
+			CompletionList list = server.completion(JsonMessageHelper.getParams(createCompletionRequest(unit, loc[0], loc[1]))).join().getRight();
+			assertNotNull(list);
+			assertEquals("Missing completion", 1, list.getItems().size());
+			assertEquals("clear() : void", list.getItems().get(0).getLabel());
+		} finally {
+			PreferenceManager.getPrefs(null).setFilteredTypes(Collections.emptyList());
+		}
+	}
+
 	@Test
 	public void testCompletion_ConstantDefaultValue() throws JavaModelException {
 		ICompilationUnit unit = getWorkingCopy("src/org/sample/Test.java",