sort text

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -2299,12 +2299,8 @@ Note: The `@react.component` decorator requires the react-jsx config to be set i
                  in which we send it. This fixes that by providing a sort text making the typed completions
                  guaranteed to end up on top. *)
               items
-              |> List.mapi (fun index (c : Completion.t) ->
-                     {
-                       c with
-                       sortText =
-                         Some ("A" ^ string_of_int (index + 1) ^ " " ^ c.name);
-                     })
+              |> List.map (fun (c : Completion.t) ->
+                     {c with sortText = Some ("A" ^ " " ^ c.name)})
             else items
           in
           items @ regularCompletions

analysis/tests/src/expected/CompletionExpressions.res.txt

@@ -233,7 +233,7 @@ Completable: Cexpression CArgument Value[fnTakingRecord]($0)=O->recordField(vari
     "tags": [],
     "detail": "One\n\ntype someVariant = One | Two | Three(int, string)",
     "documentation": null,
-    "sortText": "A1 One",
+    "sortText": "A One",
     "insertText": "One",
     "insertTextFormat": 2
   }, {

analysis/tests/src/expected/CompletionFunctionArguments.res.txt

@@ -26,7 +26,7 @@ Completable: Cexpression CArgument Value[someFn](~isOn)=t
     "tags": [],
     "detail": "bool",
     "documentation": null,
-    "sortText": "A1 true"
+    "sortText": "A true"
   }, {
     "label": "tLocalVar",
     "kind": 12,
@@ -127,7 +127,7 @@ Completable: Cexpression CArgument Value[someFnTakingVariant](~config)=O
     "tags": [],
     "detail": "One\n\ntype someVariant = One | Two | Three(int, string)",
     "documentation": null,
-    "sortText": "A1 One",
+    "sortText": "A One",
     "insertText": "One",
     "insertTextFormat": 2
   }, {
@@ -160,7 +160,7 @@ Completable: Cexpression CArgument Value[someFnTakingVariant]($0)=So
     "tags": [],
     "detail": "someVariant",
     "documentation": null,
-    "sortText": "A1 Some(_)",
+    "sortText": "A Some(_)",
     "insertText": "Some(${1:_})",
     "insertTextFormat": 2
   }, {
@@ -181,7 +181,7 @@ Completable: Cexpression CArgument Value[someFnTakingVariant](~configOpt2)=O
     "tags": [],
     "detail": "One\n\ntype someVariant = One | Two | Three(int, string)",
     "documentation": null,
-    "sortText": "A1 One",
+    "sortText": "A One",
     "insertText": "One",
     "insertTextFormat": 2
   }, {
@@ -249,7 +249,7 @@ Completable: Cexpression CArgument Value[someOtherFn]($2)=t
     "tags": [],
     "detail": "bool",
     "documentation": null,
-    "sortText": "A1 true"
+    "sortText": "A true"
   }, {
     "label": "tLocalVar",
     "kind": 12,

analysis/tests/src/expected/CompletionJsxProps.res.txt

@@ -38,7 +38,7 @@ Completable: Cexpression CJsxPropValue [CompletionSupport, TestComponent] test=T
     "tags": [],
     "detail": "Two\n\ntype testVariant = One | Two | Three(int)",
     "documentation": null,
-    "sortText": "A1 Two",
+    "sortText": "A Two",
     "insertText": "Two",
     "insertTextFormat": 2
   }, {
@@ -47,7 +47,7 @@ Completable: Cexpression CJsxPropValue [CompletionSupport, TestComponent] test=T
     "tags": [],
     "detail": "Three(int)\n\ntype testVariant = One | Two | Three(int)",
     "documentation": null,
-    "sortText": "A2 Three(_)",
+    "sortText": "A Three(_)",
     "insertText": "Three(${1:_})",
     "insertTextFormat": 2
   }, {