Merge remote branch 'origin/master' into edge

(no-precommit-check no-tn-check)

Author: mergerepo

source/ada/lsp-ada_completions.adb

@@ -49,7 +49,7 @@ package body LSP.Ada_Completions is
 
    Me_Formatting : constant GNATCOLL.Traces.Trace_Handle :=
      GNATCOLL.Traces.Create
-       ("ALS.COMPLETION.FORMATTING", Default => GNATCOLL.Traces.Off);
+       ("ALS.COMPLETION.FORMATTING", Default => GNATCOLL.Traces.On);
 
    ------------------------
    -- Is_Full_Sloc_Equal --
@@ -422,6 +422,14 @@ package body LSP.Ada_Completions is
                Result.insertTextMode :=
                  (Is_Set => True,
                   Value  => asIs);
+
+               --  Label is too verbose and can conflict with client filtering
+               --  set filterText to the content of the span we are replacing.
+               Result.filterText :=
+                 (Is_Set => True,
+                  Value  =>
+                    VSS.Strings.Conversions.To_Virtual_String (Prefix));
+
                Result.textEdit :=
                  (Is_Set => True,
                   Value  =>

testsuite/ada_lsp/completion.snippet.formatting/test.json

@@ -145,6 +145,7 @@
                         "label": "Params of Bar",
                         "kind": 15,
                         "sortText": "+00",
+                        "filterText": "Bar (",
                         "insertText": "${1:A : Integer}, ${2:B : Integer})$0",
                         "insertTextFormat": 2,
                         "textEdit": {
@@ -195,6 +196,7 @@
                         "label": "Params of Bar",
                         "kind": 15,
                         "sortText": "+03",
+                        "filterText": "Bar (",
                         "insertText": "AAAAAAAA => ${1:Integer}, BB => ${2:Integer}, CCCCCCCC => ${3:Integer}, DDDDDDDDDDDD => ${4:Integer}, E => ${5:Integer})$0",
                         "insertTextFormat": 2,
                         "textEdit": {
@@ -269,6 +271,7 @@
                         "label": "Params of Bar",
                         "kind": 15,
                         "sortText": "+09",
+                        "filterText": "Bar (",
                         "insertText": "A => ${1:Integer}, B => ${2:Integer}, C => ${3:Integer}, D => ${4:Integer}, E => ${5:Integer}, F => ${6:Integer}, G => ${7:Integer}, H => ${8:Integer}, I => ${9:Integer}, J => ${10:Integer})$0",
                         "insertTextFormat": 2,
                         "textEdit": {

testsuite/ada_lsp/completion.snippet.formatting2/test.json

@@ -156,6 +156,7 @@
                         "label": "Params of Bar",
                         "kind": 15,
                         "sortText": "+0",
+                        "filterText": "Bar (",
                         "insertText": "A => ${1:Integer}, BBBBB => ${2:Integer}, CCCCCCC => ${3:Integer}, DDD => ${4:Float})$0",
                         "insertTextFormat": 2,
                         "textEdit": {
@@ -343,6 +344,7 @@
                         "label": "Params of Bar",
                         "kind": 15,
                         "sortText": "+0",
+                        "filterText": "Bar (A => 1,",
                         "insertText": " BBBBB => ${2:Integer}, CCCCCCC => ${3:Integer}, DDD => ${4:Float})$0",
                         "insertTextFormat": 2,
                         "textEdit": {

testsuite/ada_lsp/completion.snippet.formatting3/test.json

@@ -156,6 +156,7 @@
                         "label": "Params of Foo_Bar",
                         "kind": 15,
                         "sortText": "+0",
+                        "filterText": "Foo_Bar (",
                         "insertText": "A => ${1:A      : Integer;}, BBBBBB => ${2:BBBBBB : Float;}, CCCC => ${3:CCCC   : String;}, Bar => ${4:with procedure Bar (X : Integer);})$0",
                         "insertTextFormat": 2,
                         "insertTextMode": 1,