[23] Code completion for module imports

Fix the replacement region fixes eclipse-jdt#2823
stephan-herrmann · Aug 22, 2024 · 0841695 · 0841695
1 parent f08e389
commit 0841695
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests23.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests23.java
@@ -118,14 +118,15 @@ public void test001() throws JavaModelException {
 			public class X {}
 			""");
 
-	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true);
 	requestor.allowAllRequiredProposals();
 	String str = this.workingCopies[0].getSource();
 	String completeBehind = "java.";
-	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
+	int nameStart = str.lastIndexOf(completeBehind);
+	int cursorLocation = nameStart + completeBehind.length();
 	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
 	assertResults(
-			"[MODULE_REF]{java.base, java.base, null, null, null, " + DEFAULT_RELEVANCE + "}",
+			"[MODULE_REF]{java.base, java.base, null, null, null, ["+nameStart+", "+cursorLocation+"], "+DEFAULT_RELEVANCE + "}",
 			requestor.getResults());
 }
 

diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
@@ -2291,6 +2291,8 @@ public void complete(ICompilationUnit sourceUnit, int completionPosition, int po
 								if ((importReference.modifiers & ClassFileConstants.AccModule) != 0 && this.compilerOptions.enablePreviewFeatures) {
 									this.currentModule = this.unitScope.module(); // enable module-graph analysis for readability
 									this.completionToken = CharOperation.concatWithAll(importReference.tokens, '.');
+									this.tokenStart = importReference.sourceStart;
+									this.startPosition = importReference.sourceStart;
 									findModules(this.completionToken, true);
 									return;
 								}