Add sortText depending scope of symbols

Fixes #15024

tests/cases/fourslash/codeCompletionEscaping.ts

@@ -7,7 +7,7 @@
 verify.completions({
     marker: "",
     includes: [
-        { name: "__foo", kind: "warning" },
-        { name: "___foo", kind: "warning" },
+        { name: "__foo", kind: "warning", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "___foo", kind: "warning", sortText: completion.SortText.JavascriptIdentifiers },
     ],
 });

tests/cases/fourslash/completionAfterGlobalThis.ts

@@ -5,8 +5,8 @@
 verify.completions({
     marker: "",
     exact: [
-        { name: "globalThis", kind: "module" },
+        completion.globalThisEntry,
         ...completion.globalsVars,
-        { name: "undefined", kind: "var" }
-    ]
+        completion.undefinedVarEntry
+    ].map(e => ({ ...e, sortText: completion.SortText.LocationPriority }))
 });

tests/cases/fourslash/completionEntryForClassMembers.ts

@@ -130,9 +130,9 @@ verify.completions(
         marker: "InsideMethod",
         exact: [
             "arguments",
-            "globalThis",
+            completion.globalThisEntry,
             "B", "C", "D", "D1", "D2", "D3", "D4", "D5", "D6", "E", "F", "F2", "G", "G2", "H", "I", "J", "K", "L", "L2", "M", "N", "O",
-            "undefined",
+            completion.undefinedVarEntry,
             ...completion.insideMethodKeywords,
         ],
     },
@@ -146,7 +146,9 @@ verify.completions(
             "classThatStartedWritingIdentifierAfterPrivateModifier",
             "classThatStartedWritingIdentifierAfterPrivateStaticModifier",
         ],
-        exact: ["private", "protected", "public", "static", "abstract", "async", "constructor", "get", "readonly", "set"],
+        exact: ["private", "protected", "public", "static", "abstract", "async", "constructor", "get", "readonly", "set"].map(
+            name => ({ name, sortText: completion.SortText.GlobalsOrKeywords })
+            ),
         isNewIdentifierLocation: true,
     },
     {

tests/cases/fourslash/completionEntryInJsFile.ts

@@ -12,9 +12,25 @@
 ////function foo() {
 /////*insideFunction*/
 ////}
+const warnings = [
+    { name: "classA", sortText: completion.SortText.JavascriptIdentifiers },
+    { name: "Test7", sortText: completion.SortText.JavascriptIdentifiers },
+    { name: "foo", sortText: completion.SortText.JavascriptIdentifiers }
+];
 verify.completions(
     { marker: "global", exact: completion.globalsInJsPlus(["foo", "classA", "Test7"]) },
-    { marker: "class", isNewIdentifierLocation: true, exact: ["classA", "Test7", "foo", ...completion.classElementInJsKeywords] },
-    { marker: "constructorParameter", isNewIdentifierLocation: true, exact: ["classA", "Test7", "foo"] },
+    {
+        marker: "class",
+        isNewIdentifierLocation: true,
+        exact: [
+            ...warnings,
+            ...completion.classElementInJsKeywords
+        ]
+    },
+    {
+        marker: "constructorParameter",
+        isNewIdentifierLocation: true,
+        exact: warnings
+    },
     { marker: "insideFunction", exact: completion.globalsInJsInsideFunction(["foo", "classA", "Test7"]) },
-);
+);

tests/cases/fourslash/completionInFunctionLikeBody.ts

@@ -16,7 +16,9 @@
 verify.completions(
     {
         marker: ["1", "2"],
-        includes: ["async", "await"],
+        includes: ["async", "await"].map(
+            name => ({ name, sortText: completion.SortText.GlobalsOrKeywords })
+        ),
         excludes: ["public", "private", "protected", "constructor", "readonly", "static", "abstract", "get", "set"],
     },
     { marker: ["3", "4"], exact: completion.classElementKeywords, isNewIdentifierLocation: true },

tests/cases/fourslash/completionInJSDocFunctionNew.ts

@@ -5,4 +5,4 @@
 /////** @type {function (new: string, string): string} */
 ////var f = function () { return new/**/; }
 
-verify.completions({ marker: "", includes: "new" });
+verify.completions({ marker: "", includes: { name: "new", sortText: completion.SortText.JavascriptIdentifiers } });

tests/cases/fourslash/completionInJSDocFunctionThis.ts

@@ -4,4 +4,4 @@
 /////** @type {function (this: string, string): string} */
 ////var f = function (s) { return this/**/; }
 
-verify.completions({ marker: "", includes: "this" });
+verify.completions({ marker: "", includes: { name: "this", sortText: completion.SortText.JavascriptIdentifiers } });

tests/cases/fourslash/completionInJsDoc.ts

@@ -57,7 +57,7 @@
 verify.completions(
     { marker: ["1", "2"], includes: ["constructor", "param", "type", "method", "template"] },
     { marker: ["3", "15", "16"], exact: [] },
-    { marker: ["4", "5", "8"], includes: "number" },
+    { marker: ["4", "5", "8"], includes: { name: "number", sortText: completion.SortText.GlobalsOrKeywords } },
     { marker: ["6", "7", "14"], exact: undefined },
     { marker: ["9", "10", "11", "12", "13"], includes: ["@argument", "@returns"] },
 );

tests/cases/fourslash/completionListAtEndOfWordInArrowFunction02.ts

@@ -5,5 +5,9 @@
 verify.completions({
     marker: "1",
     // TODO: should not include 'default' keyword at an expression location
-    includes: ["d", "defaultIsAnInvalidParameterName", "default"]
+    includes: [
+        "d",
+        "defaultIsAnInvalidParameterName",
+        { name: "default", sortText: completion.SortText.GlobalsOrKeywords }
+    ]
 });

tests/cases/fourslash/completionListAtEndOfWordInArrowFunction03.ts

@@ -7,6 +7,6 @@ verify.completions({
     includes: [
         "defaultIsAnInvalidParameterName",
         // This should probably stop working in the future.
-        { name: "default", text: "default", kind: "keyword" },
+        { name: "default", text: "default", kind: "keyword", sortText: completion.SortText.GlobalsOrKeywords },
     ],
 });

tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature04.ts

@@ -7,4 +7,8 @@
 ////
 ////declare function foo<TString, TNumber>(obj: I<TString, TNumber>): { /*1*/ }
 
-verify.completions({ marker: "1", exact: "readonly", isNewIdentifierLocation: true });
+verify.completions({
+    marker: "1",
+    exact: { name: "readonly", sortText: completion.SortText.GlobalsOrKeywords },
+    isNewIdentifierLocation: true
+});

tests/cases/fourslash/completionListInNamedClassExpression.ts

@@ -11,7 +11,9 @@ verify.completions(
     { marker: "0", includes: { name: "myClass", text: "(local class) myClass", kind: "local class" } },
     {
         marker: "1",
-        exact: ["private", "protected", "public", "static", "abstract", "async", "constructor", "get", "readonly", "set"],
+        exact: ["private", "protected", "public", "static", "abstract", "async", "constructor", "get", "readonly", "set"].map(
+            name => ({ name, sortText: completion.SortText.GlobalsOrKeywords })
+        ),
         isNewIdentifierLocation: true,
-    },
+    }
 );

tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature04.ts

@@ -7,4 +7,8 @@
 ////
 ////declare function foo<TString, TNumber>(obj: I<TString, TNumber>): { /*1*/
 
-verify.completions({ marker: "1", exact: "readonly", isNewIdentifierLocation: true });
+verify.completions({
+    marker: "1",
+    exact: { name: "readonly", sortText: completion.SortText.GlobalsOrKeywords } ,
+    isNewIdentifierLocation: true
+});

tests/cases/fourslash/completionListIsGlobalCompletion.ts

@@ -47,6 +47,6 @@ verify.completions(
     { marker: "10", exact: completion.classElementKeywords, isGlobalCompletion: false, isNewIdentifierLocation: true },
     { marker: "13", exact: globals, isGlobalCompletion: false },
     { marker: "15", exact: globals, isGlobalCompletion: true, isNewIdentifierLocation: true },
-    { marker: "16", exact: [...x, "globalThis", ...completion.globalsVars, "undefined"], isGlobalCompletion: false },
+    { marker: "16", exact: [...x, completion.globalThisEntry, ...completion.globalsVars, completion.undefinedVarEntry], isGlobalCompletion: false },
     { marker: "17", exact: completion.globalKeywordsPlusUndefined, isGlobalCompletion: false },
 );

tests/cases/fourslash/completionListKeywords.ts

@@ -4,4 +4,11 @@
 
 /////**/
 
-verify.completions({ marker: "", exact: ["globalThis", "undefined", ...completion.statementKeywordsWithTypes] });
+verify.completions({
+    marker: "",
+    exact: [
+        completion.globalThisEntry,
+        completion.undefinedVarEntry,
+        ...completion.statementKeywordsWithTypes
+    ]
+});

tests/cases/fourslash/completionListWithMeanings.ts

@@ -16,7 +16,7 @@
 ////var zz = </*typeExpr2*/point>{ x: 4, y: 3 };
 
 const values: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry> = [
-    "globalThis",
+    completion.globalThisEntry,
     { name: "m2", text: "namespace m2" }, // With no type side, allowed only in value
     { name: "m3", text: "namespace m3" },
     { name: "xx", text: "var xx: number" },
@@ -24,12 +24,12 @@ const values: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry> = [
     { name: "yy", text: "var yy: point" },
     { name: "kk", text: "var kk: m3.point3" },
     { name: "zz", text: "var zz: point" },
-    "undefined",
+    completion.undefinedVarEntry,
     ...completion.statementKeywordsWithTypes,
 ];
 
 const types: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry> = [
-    "globalThis",
+    completion.globalThisEntry,
     { name: "m", text: "namespace m" },
     { name: "m3", text: "namespace m3" },
     { name: "point", text: "interface point" },

tests/cases/fourslash/completionListWithModulesFromModule.ts

@@ -263,9 +263,9 @@ verify.completions(
             { name: "shwvar", text: "var shwvar: string" },
             { name: "shwcls", text: "class shwcls" },
             "tmp",
-            "globalThis",
+            completion.globalThisEntry,
             ...commonValues,
-            "undefined",
+            completion.undefinedVarEntry,
             ...completion.statementKeywordsWithTypes,
         ],
     }, {
@@ -273,7 +273,7 @@ verify.completions(
         exact: [
             { name: "shwcls", text: "class shwcls" },
             { name: "shwint", text: "interface shwint" },
-            "globalThis",
+            completion.globalThisEntry,
             ...commonTypes,
             ...completion.typeKeywords,
         ]
@@ -284,12 +284,12 @@ verify.completions(
             "Mod1",
             "iMod1",
             "tmp",
-            "globalThis",
+            completion.globalThisEntry,
             { name: "shwfn", text: "function shwfn(): void" },
             ...commonValues,
             { name: "shwcls", text: "class shwcls" },
             { name: "shwvar", text: "var shwvar: number" },
-            "undefined",
+            completion.undefinedVarEntry,
             ...completion.statementKeywordsWithTypes,
         ],
     },
@@ -298,7 +298,7 @@ verify.completions(
         exact: [
             "Mod1",
             "iMod1",
-            "globalThis",
+            completion.globalThisEntry,
             ...commonTypes,
             { name: "shwcls", text: "class shwcls" },
             { name: "shwint", text: "interface shwint" },

tests/cases/fourslash/completionListWithModulesInsideModuleScope.ts

@@ -328,7 +328,7 @@ verifyGeneral('class', {
 // from interface in mod1
 verify.completions({
     marker: "interface",
-    exact: "readonly",
+    exact: { name: "readonly", sortText: completion.SortText.GlobalsOrKeywords },
     isNewIdentifierLocation: true,
 });
 
@@ -376,7 +376,14 @@ verifyGeneral('exportedClass', {
 });
 
 // from exported interface in mod1
-verify.completions({ marker: "exportedInterface", exact: ["readonly"], isNewIdentifierLocation: true });
+verify.completions({
+    marker: "exportedInterface",
+    exact: [{
+        name: "readonly",
+        sortText: completion.SortText.GlobalsOrKeywords
+    }],
+    isNewIdentifierLocation: true
+});
 
 // from exported namespace in mod1
 verifyExportedNamespace('exportedNamespace');

tests/cases/fourslash/completionListWithModulesOutsideModuleScope.ts

@@ -256,7 +256,7 @@ verify.completions(
     // from interface scope
     {
         marker: "interface",
-        exact: ["readonly"],
+        exact: [{ name: "readonly", sortText: completion.SortText.GlobalsOrKeywords }],
         isNewIdentifierLocation: true,
     }
 );

tests/cases/fourslash/completionListWithUnresolvedModule.ts

@@ -5,4 +5,10 @@
 ////    var n: num/**/
 ////}
 
-verify.completions({ marker: "", includes: "number" });
+verify.completions({
+    marker: "",
+    includes: {
+        name: "number",
+        sortText: completion.SortText.GlobalsOrKeywords
+    }
+});

tests/cases/fourslash/completionsGeneratorFunctions.ts

@@ -18,5 +18,5 @@ verify.completions(
     { marker: ["a", "b"], exact: undefined, isNewIdentifierLocation: true },
     { marker: ["c", "d"], exact: ["baseMethod"], isNewIdentifierLocation: true },
     { marker: "e", exact: ["baseMethod"] },
-    { marker: "f", includes: ["Number"] },
+    { marker: "f", includes: [{ name: "Number", sortText: completion.SortText.GlobalsOrKeywords }] },
 );

tests/cases/fourslash/completionsImportBaseUrl.ts

@@ -25,6 +25,7 @@ verify.completions({
         kind: "const",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_augmentation.ts

@@ -21,6 +21,7 @@ verify.completions({
             source: "/a",
             sourceDisplay: "./a",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         {
             name: "bar",
@@ -28,6 +29,7 @@ verify.completions({
             source: "/a",
             sourceDisplay: "./a",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
     ],
     preferences: {

tests/cases/fourslash/completionsImport_compilerOptionsModule.ts

@@ -33,9 +33,22 @@
 ////const a = import("./a"); // Does not make this an external module
 ////fo/*dts*/
 
-verify.completions({ marker: ["b"], excludes: "foo", preferences: { includeCompletionsForModuleExports: true } });
+verify.completions({
+    marker: ["b"],
+    excludes: "foo",
+    preferences: { includeCompletionsForModuleExports: true }
+});
 verify.completions({
     marker: ["c", "ccheck", "cts", "d", "dcheck", "dts"],
-    includes: [{ name: "foo", source: "/node_modules/a/index", text: "const foo: 0", kind: "const", kindModifiers: "export,declare", hasAction: true, sourceDisplay: "a" }],
+    includes: [{
+        name: "foo",
+        source: "/node_modules/a/index",
+        text: "const foo: 0",
+        kind: "const",
+        kindModifiers: "export,declare",
+        hasAction: true,
+        sourceDisplay: "a",
+        sortText: completion.SortText.AutoImportSuggestions
+    }],
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_defaultFalsePositive.ts

@@ -22,6 +22,7 @@ verify.completions({
         kind: "const",
         kindModifiers: "export,declare",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_default_addToNamedImports.ts

@@ -18,6 +18,7 @@ verify.completions({
         kind: "function",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_default_addToNamespaceImport.ts

@@ -17,6 +17,7 @@ verify.completions({
         kind: "function",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_default_alreadyExistedWithRename.ts

@@ -17,6 +17,7 @@ verify.completions({
         kind: "function",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_default_anonymous.ts

@@ -14,10 +14,26 @@
 goTo.marker("0");
 const preferences: FourSlashInterface.UserPreferences = { includeCompletionsForModuleExports: true };
 verify.completions(
-    { marker: "0", exact: ["globalThis", "undefined", ...completion.statementKeywordsWithTypes], preferences },
+    {
+        marker: "0",
+        exact: [
+            completion.globalThisEntry,
+            completion.undefinedVarEntry,
+            ...completion.statementKeywordsWithTypes
+        ],
+        preferences
+    },
     {
         marker: "1",
-        includes: { name: "fooBar", source: "/src/foo-bar", sourceDisplay: "./foo-bar", text: "(property) default: 0", kind: "property", hasAction: true },
+        includes: {
+            name: "fooBar",
+            source: "/src/foo-bar",
+            sourceDisplay: "./foo-bar",
+            text: "(property) default: 0",
+            kind: "property",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
         preferences,
     },
 );

tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts

@@ -18,6 +18,7 @@ verify.completions({
         kind: "function",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_default_exportDefaultIdentifier.ts

@@ -14,7 +14,15 @@
 goTo.marker("");
 verify.completions({
     marker: "",
-    includes: { name: "foo", source: "/a", sourceDisplay: "./a", text: "(alias) const foo: 0\nexport default foo", kind: "alias", hasAction: true },
+    includes: {
+        name: "foo",
+        source: "/a",
+        sourceDisplay: "./a",
+        text: "(alias) const foo: 0\nexport default foo",
+        kind: "alias",
+        hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
+    },
     preferences: { includeCompletionsForModuleExports: true },
 });
 verify.applyCodeActionFromCompletion("", {

tests/cases/fourslash/completionsImport_default_fromMergedDeclarations.ts

@@ -25,6 +25,7 @@ verify.completions({
         kind: "class",
         kindModifiers: "export,declare",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_exportEquals.ts

@@ -17,12 +17,22 @@ const preferences: FourSlashInterface.UserPreferences = { includeCompletionsForM
 verify.completions(
     {
         marker: "0",
-        includes: { name: "a", source: "/a", hasAction: true, },
+        includes: {
+            name: "a",
+            source: "/a",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
         preferences,
     },
     {
         marker: "1",
-        includes: { name: "b", source: "/a", hasAction: true },
+        includes: {
+            name: "b",
+            source: "/a",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
         preferences,
     }
 );

tests/cases/fourslash/completionsImport_exportEqualsNamespace_noDuplicate.ts

@@ -18,7 +18,7 @@
 verify.completions({
     marker: "",
     // Tester will assert that it is only included once
-    includes: [{ name: "foo", source: "a", hasAction: true }],
+    includes: [{ name: "foo", source: "a", hasAction: true, sortText: completion.SortText.AutoImportSuggestions }],
     preferences: {
         includeCompletionsForModuleExports: true,
     }

tests/cases/fourslash/completionsImport_exportEquals_anonymous.ts

@@ -12,9 +12,26 @@
 
 goTo.marker("0");
 const preferences: FourSlashInterface.UserPreferences = { includeCompletionsForModuleExports: true };
-const exportEntry: FourSlashInterface.ExpectedCompletionEntryObject = { name: "fooBar", source: "/src/foo-bar", sourceDisplay: "./foo-bar", text: "(property) export=: 0", kind: "property", hasAction: true };
+const exportEntry: FourSlashInterface.ExpectedCompletionEntryObject = {
+    name: "fooBar",
+    source: "/src/foo-bar",
+    sourceDisplay: "./foo-bar",
+    text: "(property) export=: 0",
+    kind: "property",
+    hasAction: true,
+    sortText: completion.SortText.AutoImportSuggestions
+};
 verify.completions(
-    { marker: "0", exact: ["globalThis", "undefined", exportEntry, ...completion.statementKeywordsWithTypes], preferences },
+    {
+        marker: "0",
+        exact: [
+            completion.globalThisEntry,
+            completion.undefinedVarEntry,
+            exportEntry,
+            ...completion.statementKeywordsWithTypes
+        ],
+        preferences
+    },
     { marker: "1", includes: exportEntry, preferences }
 );
 verify.applyCodeActionFromCompletion("0", {

tests/cases/fourslash/completionsImport_importType.ts

@@ -21,6 +21,7 @@ verify.completions({
             sourceDisplay: "./a",
             text: "class C",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         {
             name: "T",
@@ -28,6 +29,7 @@ verify.completions({
             sourceDisplay: "./a",
             text: "type T = number",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
     ],
     excludes: "x",

tests/cases/fourslash/completionsImport_keywords.ts

@@ -34,8 +34,17 @@ verify.completions(
     {
         marker: "unique",
         exact: [
-            "globalThis", ...completion.globalsVars, "undefined",
-            { name: "unique", source: "/a", sourceDisplay: "./a", text: "(alias) const unique: 0\nexport unique", hasAction: true },
+            completion.globalThisEntry,
+            ...completion.globalsVars,
+            completion.undefinedVarEntry,
+            {
+                name: "unique",
+                source: "/a",
+                sourceDisplay: "./a",
+                text: "(alias) const unique: 0\nexport unique",
+                hasAction: true,
+                sortText: completion.SortText.AutoImportSuggestions
+            },
             ...completion.globalKeywords.filter(e => e.name !== "unique"),
         ],
         preferences,

tests/cases/fourslash/completionsImport_matching.ts

@@ -17,7 +17,16 @@
 verify.completions({
     marker: "",
     includes: ["bdf", "abcdef", "BDF"].map(name =>
-        ({ name, source: "/a", text: `function ${name}(): void`, hasAction: true, kind: "function", kindModifiers: "export", sourceDisplay: "./a" })),
+        ({
+            name,
+            source: "/a",
+            text: `function ${name}(): void`,
+            hasAction: true,
+            kind: "function",
+            kindModifiers: "export",
+            sourceDisplay: "./a",
+            sortText: completion.SortText.AutoImportSuggestions
+        })),
     excludes: ["abcde", "dbf"],
     preferences: { includeCompletionsForModuleExports: true },
 })

tests/cases/fourslash/completionsImport_multipleWithSameName.ts

@@ -20,9 +20,15 @@ goTo.marker("");
 verify.completions({
     marker: "",
     exact: [
-        "globalThis",
-        { name: "foo", text: "var foo: number", kind: "var", kindModifiers: "declare" },
-        "undefined",
+        completion.globalThisEntry,
+        {
+            name: "foo",
+            text: "var foo: number",
+            kind: "var",
+            kindModifiers: "declare",
+            sortText: completion.SortText.GlobalsOrKeywords
+        },
+        completion.undefinedVarEntry,
         {
             name: "foo",
             source: "/a",
@@ -31,6 +37,7 @@ verify.completions({
             kind: "const",
             kindModifiers: "export",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         {
             name: "foo",
@@ -40,6 +47,7 @@ verify.completions({
             kind: "const",
             kindModifiers: "export",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         ...completion.statementKeywordsWithTypes,
     ],

tests/cases/fourslash/completionsImport_named_addToNamedImports.ts

@@ -18,6 +18,7 @@ verify.completions({
         kind: "function",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_named_didNotExistBefore.ts

@@ -13,10 +13,23 @@
 verify.completions({
     marker: "",
     exact: [
-        { name: "Test2", text: "(alias) function Test2(): void\nimport Test2", kind: "alias" },
-        "globalThis",
-        "undefined",
-        { name: "Test1", source: "/a", sourceDisplay: "./a", text: "function Test1(): void", kind: "function", kindModifiers: "export", hasAction: true },
+        {
+            name: "Test2",
+            text: "(alias) function Test2(): void\nimport Test2",
+            kind: "alias"
+        },
+        completion.globalThisEntry,
+        completion.undefinedVarEntry,
+        {
+            name: "Test1",
+            source: "/a",
+            sourceDisplay: "./a",
+            text: "function Test1(): void",
+            kind: "function",
+            kindModifiers: "export",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
         ...completion.statementKeywordsWithTypes,
     ],
     preferences: { includeCompletionsForModuleExports: true },

tests/cases/fourslash/completionsImport_named_exportEqualsNamespace.ts

@@ -21,6 +21,7 @@ verify.completions({
         kind: "const",
         kindModifiers: "export,declare",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_named_exportEqualsNamespace_merged.ts

@@ -26,6 +26,7 @@ verify.completions({
         kind: "const",
         kindModifiers: "export,declare",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_named_namespaceImportExists.ts

@@ -17,6 +17,7 @@ verify.completions({
         kind: "function",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_notFromIndex.ts

@@ -26,6 +26,7 @@ for (const [marker, sourceDisplay] of [["0", "./src"], ["1", "./a"], ["2", "../a
             kind: "const",
             kindModifiers: "export",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         preferences: { includeCompletionsForModuleExports: true },
     });

tests/cases/fourslash/completionsImport_ofAlias.ts

@@ -22,8 +22,16 @@
 verify.completions({
     marker: "",
     includes: [
-        "undefined",
-        { name: "foo", source: "/a", sourceDisplay: "./a", text: "(alias) const foo: 0\nexport foo", kind: "alias", hasAction: true },
+        completion.undefinedVarEntry,
+        {
+            name: "foo",
+            source: "/a",
+            sourceDisplay: "./a",
+            text: "(alias) const foo: 0\nexport foo",
+            kind: "alias",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
         ...completion.statementKeywordsWithTypes,
     ],
     preferences: { includeCompletionsForModuleExports: true },

tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts

@@ -19,9 +19,18 @@
 verify.completions({
     marker: "",
     exact: [
-        "globalThis",
-        "undefined",
-        { name: "foo", source: "/foo/lib/foo", sourceDisplay: "./foo", text: "const foo: 0", kind: "const", kindModifiers: "export", hasAction: true },
+        completion.globalThisEntry,
+        completion.undefinedVarEntry,
+        {
+            name: "foo",
+            source: "/foo/lib/foo",
+            sourceDisplay: "./foo",
+            text: "const foo: 0",
+            kind: "const",
+            kindModifiers: "export",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
         ...completion.statementKeywordsWithTypes,
     ],
     preferences: { includeCompletionsForModuleExports: true },

tests/cases/fourslash/completionsImport_previousTokenIsSemicolon.ts

@@ -17,6 +17,7 @@ verify.completions({
         kind: "function",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_reExportDefault.ts

@@ -15,9 +15,9 @@
 verify.completions({
     marker: "",
     exact: [
-        "globalThis",
+        completion.globalThisEntry,
         ...completion.globalsVars,
-        "undefined",
+        completion.undefinedVarEntry,
         {
             name: "foo",
             source: "/a/b/impl",
@@ -26,6 +26,7 @@ verify.completions({
             kind: "function",
             kindModifiers: "export",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         {
             name: "foo",
@@ -34,6 +35,7 @@ verify.completions({
             text: "(alias) function foo(): void\nexport foo",
             kind: "alias",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         ...completion.globalKeywords,
     ],

tests/cases/fourslash/completionsImport_reExport_wrongName.ts

@@ -15,8 +15,22 @@ goTo.marker("");
 verify.completions({
     marker: "",
     includes: [
-        { name: "x", source: "/a", sourceDisplay: "./a", text: "const x: 0", hasAction: true },
-        { name: "y", source: "/index", sourceDisplay: ".", text: "(alias) const y: 0\nexport y", hasAction: true },
+        {
+            name: "x",
+            source: "/a",
+            sourceDisplay: "./a",
+            text: "const x: 0",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
+        {
+            name: "y",
+            source: "/index",
+            sourceDisplay: ".",
+            text: "(alias) const y: 0\nexport y",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
+        },
     ],
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_require.ts

@@ -19,6 +19,7 @@ verify.completions({
         kind: "const",
         kindModifiers: "export",
         hasAction: true,
+        sortText: completion.SortText.AutoImportSuggestions
     },
     preferences: { includeCompletionsForModuleExports: true },
 });

tests/cases/fourslash/completionsImport_shadowedByLocal.ts

@@ -1,16 +1,24 @@
-/// <reference path="fourslash.ts" />
-
-// @noLib: true
-
-// @Filename: /a.ts
-////export const foo = 0;
-
-// @Filename: /b.ts
-////const foo = 1;
-////fo/**/
-
-verify.completions({
-    marker: "",
-    exact: ["globalThis", { name: "foo", text: "const foo: 1" }, "undefined", ...completion.statementKeywordsWithTypes],
-    preferences: { includeCompletionsForModuleExports: true },
-});
+/// <reference path="fourslash.ts" />
+
+// @noLib: true
+
+// @Filename: /a.ts
+////export const foo = 0;
+
+// @Filename: /b.ts
+////const foo = 1;
+////fo/**/
+
+verify.completions({
+    marker: "",
+    exact: [
+        completion.globalThisEntry,
+        {
+            name: "foo",
+            text: "const foo: 1",
+        },
+        completion.undefinedVarEntry,
+        ...completion.statementKeywordsWithTypes
+    ],
+    preferences: { includeCompletionsForModuleExports: true },
+});

tests/cases/fourslash/completionsImport_tsx.ts

@@ -12,7 +12,7 @@
 
 verify.completions({
     marker: "",
-    includes: { name: "Foo", source: "/a", hasAction: true },
+    includes: { name: "Foo", source: "/a", hasAction: true, sortText: completion.SortText.AutoImportSuggestions },
     excludes: "Bar",
     preferences: {
         includeCompletionsForModuleExports: true,

tests/cases/fourslash/completionsInterfaceElement.ts

@@ -13,4 +13,11 @@
 
 ////interface EndOfFile { f; /*e*/
 
-verify.completions({ marker: test.markers(), exact: "readonly", isNewIdentifierLocation: true });
+verify.completions({
+    marker: test.markers(),
+    exact: {
+        name: "readonly",
+        sortText: completion.SortText.GlobalsOrKeywords
+    },
+    isNewIdentifierLocation: true
+});

tests/cases/fourslash/completionsJsdocTypeTagCast.ts

@@ -4,4 +4,10 @@
 // @Filename: /a.js
 ////const x = /** @type {{ s: string }} */ ({ /**/ });
 
-verify.completions({ marker: "", exact: ["s", "x"] });
+verify.completions({
+    marker: "",
+    exact: [
+        "s",
+        { name: "x", sortText: completion.SortText.JavascriptIdentifiers }
+    ]
+});

tests/cases/fourslash/completionsJsxAttributeInitializer.ts

@@ -9,8 +9,8 @@ verify.completions({
     marker: "",
     includes: [
         { name: "x", text: "(parameter) x: number", kind: "parameter", insertText: "{x}" },
-        { name: "p", text: "(JSX attribute) p: number", kind: "JSX attribute", insertText: "{this.p}" },
-        { name: "a b", text: '(JSX attribute) "a b": number', kind: "JSX attribute", insertText: '{this["a b"]}' },
+        { name: "p", text: "(JSX attribute) p: number", kind: "JSX attribute", insertText: "{this.p}", sortText: completion.SortText.SuggestedClassMembers },
+        { name: "a b", text: '(JSX attribute) "a b": number', kind: "JSX attribute", insertText: '{this["a b"]}', sortText: completion.SortText.SuggestedClassMembers },
     ],
     preferences: {
         includeInsertTextCompletions: true,

tests/cases/fourslash/completionsKeywordsExtends.ts

@@ -7,5 +7,5 @@
 
 verify.completions(
     { marker: "a", exact: undefined },
-    { marker: ["b", "c"], includes: "extends" },
+    { marker: ["b", "c"], includes: { name: "extends", sortText: completion.SortText.GlobalsOrKeywords } },
 );

tests/cases/fourslash/completionsRecommended_import.ts

@@ -28,6 +28,7 @@ const classEntry = (isConstructor: boolean): FourSlashInterface.ExpectedCompleti
     text: isConstructor ? "constructor Cls(): Cls" : "class Cls",
     hasAction: true,
     isRecommended: true,
+    sortText: completion.SortText.AutoImportSuggestions
 });
 verify.completions(
     { marker: "b0", includes: classEntry(true), preferences },

tests/cases/fourslash/completionsRecommended_namespace.ts

@@ -38,6 +38,7 @@ verify.completions(
             kindModifiers: "export",
             hasAction: true,
             isRecommended: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         preferences: { includeCompletionsForModuleExports: true },
     },

tests/cases/fourslash/completionsThisType.ts

@@ -14,15 +14,15 @@ verify.completions(
     {
         marker: "",
         includes: [
-            { name: "xyz", text: "(method) C.xyz(): any", kind: "method", insertText: "this.xyz" },
-            { name: "foo bar", text: '(property) C["foo bar"]: number', kind: "property", insertText: 'this["foo bar"]' },
+            { name: "xyz", text: "(method) C.xyz(): any", kind: "method", insertText: "this.xyz", sortText: completion.SortText.SuggestedClassMembers },
+            { name: "foo bar", text: '(property) C["foo bar"]: number', kind: "property", insertText: 'this["foo bar"]', sortText: completion.SortText.SuggestedClassMembers },
         ],
         isNewIdentifierLocation: true,
         preferences,
     },
     {
         marker: "f",
-        includes: { name: "x", text: "(property) x: number", kind: "property", insertText: "this.x" },
+        includes: { name: "x", text: "(property) x: number", kind: "property", insertText: "this.x", sortText: completion.SortText.SuggestedClassMembers },
         preferences,
     },
 );

tests/cases/fourslash/completionsTypeKeywords.ts

@@ -6,5 +6,5 @@
 
 verify.completions({
     marker: "",
-    exact: ["globalThis", "T", ...completion.typeKeywords],
+    exact: [completion.globalThisEntry, "T", ...completion.typeKeywords],
 });

tests/cases/fourslash/doubleUnderscoreCompletions.ts

@@ -12,7 +12,7 @@ verify.completions({
     marker: "1",
     exact: [
         { name: "__property", text: "(property) MyObject.__property: number" },
-        "MyObject",
-        "instance",
+        { name: "MyObject", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "instance", sortText: completion.SortText.JavascriptIdentifiers },
     ],
 });

tests/cases/fourslash/fourslash.ts

@@ -528,6 +528,7 @@ declare namespace FourSlashInterface {
         readonly isRecommended?: boolean;
         readonly kind?: string;
         readonly kindModifiers?: string;
+        readonly sortText?: completion.SortText;
 
         // details
         readonly text?: string;
@@ -650,6 +651,15 @@ declare var cancellation: FourSlashInterface.cancellation;
 declare var classification: typeof FourSlashInterface.classification;
 declare namespace completion {
     type Entry = FourSlashInterface.ExpectedCompletionEntryObject;
+    export const enum SortText {
+        LocationPriority = "0",
+        SuggestedClassMembers = "1",
+        GlobalsOrKeywords = "2",
+        AutoImportSuggestions = "3",
+        JavascriptIdentifiers = "4"
+    }
+    export const globalThisEntry: Entry;
+    export const undefinedVarEntry: Entry;
     export const globals: ReadonlyArray<Entry>;
     export const globalsInJs: ReadonlyArray<Entry>;
     export const globalKeywords: ReadonlyArray<Entry>;

tests/cases/fourslash/getJavaScriptCompletions12.ts

@@ -26,5 +26,5 @@
 verify.completions(
     { marker: "1", includes: { name: "charCodeAt", kind: "method", kindModifiers: "declare" } },
     { marker: ["2", "3", "4"], includes: { name: "toExponential", kind: "method", kindModifiers: "declare" } },
-    { marker: "5", includes: { name: "test1", kind: "warning" } },
+    { marker: "5", includes: { name: "test1", kind: "warning", sortText: completion.SortText.JavascriptIdentifiers } },
 );

tests/cases/fourslash/getJavaScriptCompletions13.ts

@@ -14,6 +14,21 @@
 ////file2Identifier2./*2*/
 
 verify.completions(
-    { marker: "1", includes: ["file2Identifier1", "file2Identifier2", "file1Identifier"], excludes: "FooProp" },
-    { marker: "2", includes: ["file2Identifier1", "file2Identifier2"], excludes: ["file1Identifier", "FooProp"] },
-)
+    {
+        marker: "1",
+        includes: [
+            "file2Identifier1",
+            "file2Identifier2",
+            { name: "file1Identifier", sortText: completion.SortText.GlobalsOrKeywords }
+        ],
+        excludes: "FooProp"
+    },
+    {
+        marker: "2",
+        includes: [
+            { name: "file2Identifier1", sortText: completion.SortText.JavascriptIdentifiers },
+            { name: "file2Identifier2", sortText: completion.SortText.JavascriptIdentifiers }
+        ],
+        excludes: ["file1Identifier", "FooProp"]
+    },
+);

tests/cases/fourslash/getJavaScriptCompletions15.ts

@@ -22,6 +22,16 @@
 verify.completions(
     { marker: "1", includes: "toExponential" },
     { marker: "2", includes: "toLowerCase" },
-    { marker: "3", exact: ["V", "ref1", "ref2", "require", "v", "x"] },
+    {
+        marker: "3",
+        exact: [
+            "V",
+            { name: "ref1", sortText: completion.SortText.JavascriptIdentifiers },
+            { name: "ref2", sortText: completion.SortText.JavascriptIdentifiers },
+            { name: "require", sortText: completion.SortText.JavascriptIdentifiers },
+            { name: "v", sortText: completion.SortText.JavascriptIdentifiers },
+            { name: "x", sortText: completion.SortText.JavascriptIdentifiers }
+        ]
+    },
     { marker: "4", includes: "toLowerCase" },
 );

tests/cases/fourslash/getJavaScriptCompletions20.ts

@@ -19,5 +19,12 @@
 
 verify.completions({
     marker: "",
-    exact: ["getName", "getNa", ...completion.functionMembersWithPrototype, "Person", "name", "age"],
+    exact: [
+        "getName",
+        "getNa",
+        ...completion.functionMembersWithPrototype,
+        { name: "Person", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "name", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "age", sortText: completion.SortText.JavascriptIdentifiers }
+    ],
 });

tests/cases/fourslash/getJavaScriptGlobalCompletions1.ts

@@ -12,4 +12,4 @@
 ////
 //// hello/**/
 
-verify.completions({ includes: "helloWorld" });
+verify.completions({ includes: { name: "helloWorld", sortText: completion.SortText.JavascriptIdentifiers } });

tests/cases/fourslash/importJsNodeModule2.ts

@@ -19,7 +19,7 @@ edit.insert('.');
 verify.completions({
     exact: [
         ...["n", "s", "b"].map(name => ({ name, kind: "property" })),
-        ...["x", "require"].map(name => ({ name, kind: "warning" })),
+        ...["x", "require"].map(name => ({ name, kind: "warning", sortText: completion.SortText.JavascriptIdentifiers })),
     ],
 });
 edit.insert('n.');

tests/cases/fourslash/indirectClassInstantiation.ts

@@ -14,7 +14,18 @@
 //// inst2.blah/*b*/;
 
 goTo.marker('a');
-verify.completions({ exact: ["property", "TestObj", "constructor", "instance", "class2", "prototype", "blah", "inst2"] });
+verify.completions({
+    exact: [
+        "property",
+        { name: "TestObj", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "constructor", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "instance", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "class2", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "prototype", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "blah", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "inst2", sortText: completion.SortText.JavascriptIdentifiers }
+    ]
+});
 edit.backspace();
 
 goTo.marker('b');

tests/cases/fourslash/javaScriptClass1.ts

@@ -19,7 +19,15 @@
 
 goTo.marker();
 edit.insert('.');
-verify.completions({ exact: ["bar", "thing", "union", "Foo", "x"] });
+verify.completions({
+    exact: [
+        "bar",
+        "thing",
+        "union",
+        { name: "Foo", sortText: completion.SortText.JavascriptIdentifiers },
+        { name: "x", sortText: completion.SortText.JavascriptIdentifiers }
+    ]
+});
 
 edit.insert('bar.');
 verify.completions({ includes: ["substr"] });

tests/cases/fourslash/javaScriptModules12.ts

@@ -27,7 +27,45 @@
 //// /*5*/
 
 verify.completions(
-    { marker: "1", includes: ["x", "a", "b"], excludes: "y" },
-    { marker: "2", includes: ["y", "a", "b"], excludes: "x" },
-    { marker: ["3", "4", "5"], includes: ["a", "b"], excludes: ["x", "y"] },
+    {
+        marker: "1",
+        includes: [
+            "x",
+            { name: "a", sortText: completion.SortText.GlobalsOrKeywords },
+            { name: "b", sortText: completion.SortText.GlobalsOrKeywords }
+        ], excludes: "y"
+    },
+    {
+        marker: "2",
+        includes: [
+            "y",
+            { name: "a", sortText: completion.SortText.GlobalsOrKeywords },
+            { name: "b", sortText: completion.SortText.GlobalsOrKeywords }
+        ],
+        excludes: "x"
+    },
+    {
+        marker: "3",
+        includes: [
+            "a",
+            { name: "b", sortText: completion.SortText.GlobalsOrKeywords }
+        ],
+        excludes: ["x", "y"]
+    },
+    {
+        marker: "4",
+        includes: [
+            { name: "a", sortText: completion.SortText.GlobalsOrKeywords },
+            "b"
+        ],
+        excludes: ["x", "y"]
+    },
+    {
+        marker: ["5"],
+        includes: [
+            { name: "a", sortText: completion.SortText.GlobalsOrKeywords },
+            { name: "b", sortText: completion.SortText.GlobalsOrKeywords }
+        ],
+        excludes: ["x", "y"]
+    },
 );

tests/cases/fourslash/javaScriptModules13.ts

@@ -19,7 +19,11 @@
 goTo.file('consumer.js');
 goTo.marker();
 
-verify.completions({ marker: "", includes: "y", excludes: "invisible" });
+verify.completions({
+    marker: "",
+    includes: { name: "y", sortText: completion.SortText.GlobalsOrKeywords },
+    excludes: "invisible"
+});
 
 edit.insert('x.');
 verify.completions({ includes: { name: "a", kind: "property" } });

tests/cases/fourslash/javaScriptModules14.ts

@@ -21,4 +21,8 @@
 //// var x = require('myMod');
 //// /**/;
 
-verify.completions({ marker: "", includes: "y", excludes: "invisible" });
+verify.completions({
+    marker: "",
+    includes: { name: "y", sortText: completion.SortText.GlobalsOrKeywords },
+    excludes: "invisible"
+});

tests/cases/fourslash/javaScriptModules16.ts

@@ -18,7 +18,7 @@ edit.insert('.');
 verify.completions({
     exact: [
         ...["n", "s", "b"].map(name => ({ name, kind: "property" })),
-        ...["x", "require"].map(name => ({ name, kind: "warning" })),
+        ...["x", "require"].map(name => ({ name, kind: "warning", sortText: completion.SortText.JavascriptIdentifiers })),
     ],
 });
 edit.insert('n.');

tests/cases/fourslash/javaScriptModules19.ts

@@ -17,7 +17,11 @@
 goTo.file('consumer.js');
 goTo.marker();
 
-verify.completions({ marker: "", includes: "y", excludes: "invisible" });
+verify.completions({
+    marker: "",
+    includes: { name: "y", sortText: completion.SortText.GlobalsOrKeywords },
+    excludes: "invisible"
+});
 
 edit.insert('x.');
 verify.completions({ includes: { name: "a", kind: "property" } });

tests/cases/fourslash/javaScriptPrototype2.ts

@@ -31,4 +31,4 @@ verify.completions({ includes: { name: "toFixed", kind: "method", kindModifiers:
 goTo.marker('3');
 edit.insert('.');
 // Make sure symbols don't leak out into the constructor
-verify.completions({ includes: ["qua", "foo", "bar"].map(name => ({ name, kind: "warning" })) });
+verify.completions({ includes: ["qua", "foo", "bar"].map(name => ({ name, kind: "warning", sortText: completion.SortText.JavascriptIdentifiers })) });

tests/cases/fourslash/javaScriptPrototype3.ts

@@ -22,6 +22,10 @@ verify.completions({
         { name: "qua", kind: "property" },
         { name: "foo", kind: "method" },
         { name: "bar", kind: "method" },
-        ...["myCtor", "x", "prototype"].map(name => ({ name, kind: "warning" })),
+        ...["myCtor", "x", "prototype"].map(name => ({
+            name,
+            kind: "warning",
+            sortText: completion.SortText.JavascriptIdentifiers
+        })),
     ],
 });

tests/cases/fourslash/javaScriptPrototype4.ts

@@ -16,4 +16,7 @@ goTo.marker('1');
 edit.insert('.');
 
 // Check members of the function
-verify.completions({ includes: ["foo", "bar", "qua"].map(name => ({ name, kind: "warning" })) });
+verify.completions({
+    includes: ["foo", "bar", "qua"].map(
+        name => ({ name, kind: "warning", sortText: completion.SortText.JavascriptIdentifiers }))
+});

tests/cases/fourslash/javascriptModules20.ts

@@ -9,4 +9,8 @@
 //// import * as mod from "./mod"
 //// mod./**/
 
-verify.completions({ marker: "", exact: [{ name: "a", kind: "property" }, { name: "mod", kind: "warning" }] });
+verify.completions({
+    marker: "", exact: [
+        { name: "a", kind: "property" },
+        { name: "mod", kind: "warning", sortText: completion.SortText.JavascriptIdentifiers }]
+});

tests/cases/fourslash/javascriptModules21.ts

@@ -10,4 +10,10 @@
 //// import mod from "./mod"
 //// mod./**/
 
-verify.completions({ marker: "", exact: [{ name: "a", kind: "property" }, { name: "mod", kind: "warning" }] });
+verify.completions({
+    marker: "",
+    exact: [
+        { name: "a", kind: "property" },
+        { name: "mod", kind: "warning", sortText: completion.SortText.JavascriptIdentifiers }
+    ]
+});

tests/cases/fourslash/jsFileJsdocTypedefTagTypeExpressionCompletion.ts

@@ -29,7 +29,7 @@ const typeMembers: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntryObjec
     { name: "O", kind: "module", kindModifiers: "export" },
 ];
 function warnings(entries: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntryObject>): ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry> {
-    return entries.map(e => ({ ...e, kind: "warning", kindModifiers: undefined }));
+    return entries.map(e => ({ ...e, kind: "warning", kindModifiers: undefined, sortText: completion.SortText.JavascriptIdentifiers }));
 }
 
 verify.completions(

tests/cases/fourslash/jsFileJsdocTypedefTagTypeExpressionCompletion2.ts

@@ -28,10 +28,10 @@ function getCompletions(nonWarnings: ReadonlyArray<string>): ReadonlyArray<FourS
         { name: "property1", kind: "property" },
         { name: "method3", kind: "method" },
         { name: "method4", kind: "method" },
-        { name: "foo", kind: "warning" },
+        { name: "foo", kind: "warning", sortText: completion.SortText.JavascriptIdentifiers },
     ];
     for (const name of nonWarnings) ts.Debug.assert(withKinds.some(entry => entry.name === name));
-    return withKinds.map(entry => nonWarnings.includes(entry.name) ? entry : ({ name: entry.name, kind: "warning" }));
+    return withKinds.map(entry => nonWarnings.includes(entry.name) ? entry : ({ name: entry.name, kind: "warning", sortText: completion.SortText.JavascriptIdentifiers }));
 }
 
 verify.completions(

tests/cases/fourslash/jsFileJsdocTypedefTagTypeExpressionCompletion3.ts

@@ -31,7 +31,7 @@
 ////Foo./*valueMemberOfFoo*/;
 
 const warnings = (names: ReadonlyArray<string>): ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry> =>
-    names.map(name => ({ name, kind: "warning" }));
+    names.map(name => ({ name, kind: "warning", sortText: completion.SortText.JavascriptIdentifiers }));
 
 verify.completions(
     {

tests/cases/fourslash/noImportCompletionsInOtherJavaScriptFile.ts

@@ -32,6 +32,7 @@ goTo.eachMarker(() => {
             kind: "const",
             kindModifiers: "export,declare",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         preferences: { includeCompletionsForModuleExports: true },
     });
@@ -45,6 +46,7 @@ goTo.eachMarker(() => {
             kind: "const",
             kindModifiers: "export,declare",
             hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         preferences: { includeCompletionsForModuleExports: true },
     });

tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts

@@ -17,5 +17,5 @@
 
 verify.completions(
     { marker: ["1", "3"], includes: ["charAt", "toExponential"] },
-    { marker: "2", includes: "age" },
+    { marker: "2", includes: { name: "age", sortText: completion.SortText.JavascriptIdentifiers } },
 );

tests/cases/fourslash/tsxCompletion9.ts

@@ -18,4 +18,4 @@
 for (var i = 1; i <= 10; i++) {
 	verify.completions({ marker: String(i), exact: undefined });
 }
-verify.completions({ marker: "end", includes: "null" });
+verify.completions({ marker: "end", includes: { name: "null", sortText: completion.SortText.GlobalsOrKeywords } });

tests/cases/fourslash/tsxCompletionNonTagLessThan.ts

@@ -5,7 +5,20 @@
 ////[].map<numb/*b*/;
 ////1 < Infini/*c*/;
 
-verify.completions(
-    { marker: ["a", "b"], includes: "number", excludes: "SVGNumber" },
-    { marker: "c", includes: "Infinity" },
+verify.completions(
+    {
+    marker: ["a", "b"],
+    includes: {
+        name: "number",
+        sortText: completion.SortText.GlobalsOrKeywords
+    },
+    excludes: "SVGNumber"
+    },
+    {
+        marker: "c",
+        includes: {
+            name: "Infinity",
+            sortText: completion.SortText.GlobalsOrKeywords
+        }
+    },
 );

tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts

@@ -3,4 +3,4 @@
 //@Filename: file.tsx
 //// var x = </**/;
 
-verify.completions({ marker: "", exact: ["globalThis", ...completion.globalsVars, "x", "undefined"] });
+verify.completions({ marker: "", exact: [completion.globalThisEntry, ...completion.globalsVars, "x", completion.undefinedVarEntry] });