match filterText with textEdit

Signed-off-by: Yan Zhang <[email protected]>
eclipse-jdtls · Feb 28, 2020 · 59b223a · 59b223a
1 parent 0585be7
commit 59b223a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
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
@@ -266,6 +266,11 @@ public CompletionItem toCompletionItem(CompletionProposal proposal, int index) {
 			}
 		}
 		proposalProvider.updateReplacement(proposal, $, '\0');
+		// Make sure `filterText` matches `textEdit`
+		// See https://github.com/eclipse/eclipse.jdt.ls/issues/1348
+		if (proposal.getKind() == CompletionProposal.TYPE_REF && $.getTextEdit() != null && $.getTextEdit().getRange() != null && $.getTextEdit().getNewText() != null) {
+			$.setFilterText($.getTextEdit().getNewText());
+		}
 		return $;
 	}
 

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
@@ -237,7 +237,8 @@ public void testCompletion_object() throws Exception{
 			assertTrue(isNotBlank(item.getInsertText()));
 			assertNotNull(item.getFilterText());
 			assertFalse(item.getFilterText().contains(" "));
-			assertTrue(item.getLabel().startsWith(item.getFilterText()));
+			assertTrue(item.getLabel().startsWith(item.getInsertText()));
+			assertTrue(item.getFilterText().startsWith("Objec"));
 			//Check contains data used for completionItem resolution
 			@SuppressWarnings("unchecked")
 			Map<String,String> data = (Map<String, String>) item.getData();
@@ -790,6 +791,7 @@ public void testCompletion_import_type() throws JavaModelException{
 		assertEquals("Map", item.getInsertText());
 		assertNotNull(item.getTextEdit());
 		assertTextEdit(3, 3, 15, "java.util.Map", item.getTextEdit());
+		assertTrue(item.getFilterText().startsWith("java.util.Ma"));
 		//Not checking the range end character
 	}