Fix Symbol completion priority and cursor positioning (#61945)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: RyanCavanaugh <[email protected]>
Co-authored-by: Jake Bailey <[email protected]>
Co-authored-by: Ryan Cavanaugh <[email protected]>

Author: 3 people

src/services/completions.ts

@@ -3851,6 +3851,10 @@ function getCompletionData(
             if (firstAccessibleSymbolId && addToSeen(seenPropertySymbols, firstAccessibleSymbolId)) {
                 const index = symbols.length;
                 symbols.push(firstAccessibleSymbol);
+
+                // Symbol completions should have lower priority since they represent computed property access
+                symbolToSortTextMap[getSymbolId(firstAccessibleSymbol)] = SortText.GlobalsOrKeywords;
+
                 const moduleSymbol = firstAccessibleSymbol.parent;
                 if (
                     !moduleSymbol ||

tests/baselines/reference/completionsUniqueSymbol2.baseline

@@ -56,7 +56,7 @@
           "name": "a",
           "kind": "const",
           "kindModifiers": "",
-          "sortText": "11",
+          "sortText": "15",
           "insertText": "[a]",
           "replacementSpan": {
             "start": 344,
@@ -210,7 +210,7 @@
           "name": "b",
           "kind": "const",
           "kindModifiers": "",
-          "sortText": "11",
+          "sortText": "15",
           "insertText": "[b]",
           "replacementSpan": {
             "start": 344,

tests/cases/fourslash/completionForComputedStringProperties.ts

@@ -8,11 +8,11 @@
 //// declare const a: A;
 //// a[|./**/|]
 
-verify.completions({
-    marker: "",
-    exact: [
-        { name: "p1" },
-        { name: "p2", insertText: '[p2]', replacementSpan: test.ranges()[0] },
-    ],
-    preferences: { includeInsertTextCompletions: true },
+verify.completions({
+    marker: "",
+    exact: [
+        { name: "p1" },
+        { name: "p2", insertText: '[p2]', sortText: completion.SortText.GlobalsOrKeywords, replacementSpan: test.ranges()[0] },
+    ],
+    preferences: { includeInsertTextCompletions: true },
 });

tests/cases/fourslash/completionsSymbolMembers.ts

@@ -14,12 +14,12 @@
 verify.completions(
     {
         marker: "i",
-        exact: { name: "s", insertText: "[s]", replacementSpan: test.ranges()[0] },
+        exact: { name: "s", insertText: "[s]", sortText: completion.SortText.GlobalsOrKeywords, replacementSpan: test.ranges()[0] },
         preferences: { includeInsertTextCompletions: true },
     },
     {
         marker: "j",
-        exact: { name: "N", insertText: "[N]", replacementSpan: test.ranges()[1] },
+        exact: { name: "N", insertText: "[N]", sortText: completion.SortText.GlobalsOrKeywords, replacementSpan: test.ranges()[1] },
         preferences: { includeInsertTextCompletions: true },
     }
 );

tests/cases/fourslash/completionsUniqueSymbol1.ts

@@ -17,6 +17,6 @@
 
 verify.completions({
     marker: "",
-    exact: { name: "M", insertText: "[M]", replacementSpan: test.ranges()[0] },
+    exact: { name: "M", insertText: "[M]", sortText: completion.SortText.GlobalsOrKeywords, replacementSpan: test.ranges()[0] },
     preferences: { includeInsertTextCompletions: true },
 });

tests/cases/fourslash/completionsUniqueSymbol_import.ts

@@ -24,7 +24,7 @@ verify.completions({
     marker: "",
     exact: [
         "n",
-        { name: "publicSym", source: "/a", insertText: "[publicSym]", replacementSpan: test.ranges()[0], hasAction: true },
+        { name: "publicSym", source: "/a", insertText: "[publicSym]", sortText: completion.SortText.GlobalsOrKeywords, replacementSpan: test.ranges()[0], hasAction: true },
     ],
     preferences: {
         includeInsertTextCompletions: true,

tests/cases/fourslash/symbolCompletionLowerPriority.ts

@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+////declare const Symbol: (s: string) => symbol;
+////const mySymbol = Symbol("test");
+////interface TestInterface { 
+////    [mySymbol]: string;
+////    normalProperty: number;
+////}
+////const obj: TestInterface = {} as any;
+////obj./*completions*/
+
+// Test new behavior: Symbol completions should have lower priority  
+verify.completions({
+    marker: "completions",
+    includes: [
+        { name: "normalProperty", sortText: completion.SortText.LocationPriority },
+        { name: "mySymbol", sortText: completion.SortText.GlobalsOrKeywords, insertText: "[mySymbol]" }
+    ],
+    preferences: { includeInsertTextCompletions: true }
+});