From 97f437cda9b1fb878bf5d3673628d4285147feb6 Mon Sep 17 00:00:00 2001
From: Jinbo Wang <jinbwan@microsoft.com>
Date: Wed, 14 Oct 2020 10:43:16 +0800
Subject: [PATCH] Fix the wrong completion list in debug console

---
 .project                                           | 11 +++++++++++
 com.microsoft.java.debug.core/.project             | 11 +++++++++++
 com.microsoft.java.debug.plugin/.project           | 11 +++++++++++
 .../debug/plugin/internal/CompletionsProvider.java | 14 +++++++++++++-
 com.microsoft.java.debug.repository/.project       | 11 +++++++++++
 5 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/.project b/.project
index f659e76ef..d34865de3 100644
--- a/.project
+++ b/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1600224298170</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.microsoft.java.debug.core/.project b/com.microsoft.java.debug.core/.project
index 773c5b793..a7480133e 100644
--- a/com.microsoft.java.debug.core/.project
+++ b/com.microsoft.java.debug.core/.project
@@ -26,4 +26,15 @@
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1599036548523</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.microsoft.java.debug.plugin/.project b/com.microsoft.java.debug.plugin/.project
index b7a152d24..72ba17ff7 100644
--- a/com.microsoft.java.debug.plugin/.project
+++ b/com.microsoft.java.debug.plugin/.project
@@ -37,4 +37,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1599036548577</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionsProvider.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionsProvider.java
index bf5131344..3b9680017 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionsProvider.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/CompletionsProvider.java
@@ -69,7 +69,8 @@ public List<CompletionItem> codeComplete(StackFrame frame, String snippet, int l
 
                 collector.setAllowsRequiredProposals(CompletionProposal.TYPE_REF, CompletionProposal.TYPE_REF, true);
 
-                type.codeComplete(snippet.toCharArray(), offset, snippet.length(), null, null, null, frame.location().method().isStatic(), collector);
+                int position = getInsertPosition(snippet, line, column);
+                type.codeComplete(snippet.toCharArray(), offset, position, null, null, null, frame.location().method().isStatic(), collector);
 
                 List<org.eclipse.lsp4j.CompletionItem> items = collector.getCompletionItems();
 
@@ -87,6 +88,17 @@ public List<CompletionItem> codeComplete(StackFrame frame, String snippet, int l
         return res;
     }
 
+    private int getInsertPosition(String snippet, int line, int column) {
+        int lineInSnippet = context.isClientLinesStartAt1() ? line - 1 : line;
+        int offsetInSnippet = -1;
+        for (int i = 0; i < lineInSnippet; i++) {
+            offsetInSnippet = snippet.indexOf('\n', offsetInSnippet + 1);
+        }
+
+        offsetInSnippet++;
+        return offsetInSnippet + column + (context.isClientColumnsStartAt1() ?  -1 : 0);
+    }
+
     private IType resolveType(StackFrame frame) throws CoreException, DebugException {
         ISourceLookUpProvider sourceProvider = context.getProvider(ISourceLookUpProvider.class);
         if (sourceProvider instanceof JdtSourceLookUpProvider) {
diff --git a/com.microsoft.java.debug.repository/.project b/com.microsoft.java.debug.repository/.project
index 42d872c95..887e4a7a8 100644
--- a/com.microsoft.java.debug.repository/.project
+++ b/com.microsoft.java.debug.repository/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1600224298119</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>