Merge remote branch 'origin/master' into edge

AdaCore · Jun 26, 2024 · f056f83 · f056f83
2 parents 15c4384 + 01f0724
commit f056f83
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 33 deletions.
diff --git a/...test/workspaces/general/src/highlighting/lsp-ada_handlers/lsp-ada_handlers.adb.sem.tokens b/...test/workspaces/general/src/highlighting/lsp-ada_handlers/lsp-ada_handlers.adb.sem.tokens
@@ -281,6 +281,8 @@ line 759: column 36 - 39: parameter     [declaration, readonly]          : Node
 line 766: column 20 - 33: function      [declaration]                    : Append_Command
 line 766: column 36 - 39: parameter     [declaration, readonly]          : Node
 line 767: column 13 - 19: variable      [declaration]                    : Command
+line 767: column 23 - 25: namespace                                      : LSP
+line 767: column 27 - 38: namespace                                      : Ada_Handlers
 line 768: column 13 - 19: variable      [declaration]                    : Pointer
 line 768: column 23 - 25: namespace                                      : LSP
 line 769: column 13 - 16: variable      [declaration]                    : Item

diff --git a/testsuite/ada_lsp/completion.invisible3/test.json b/testsuite/ada_lsp/completion.invisible3/test.json
@@ -1,14 +1,12 @@
 [
    {
       "comment": [
-          "Check no 'unneeded' symbols (symbols of some decl kinds, from body and private part) in completion."
+         "Check no 'unneeded' symbols (symbols of some decl kinds, from body and private part) in completion."
       ]
    },
    {
       "start": {
-         "cmd": [
-            "${ALS}"
-         ]
+         "cmd": ["${ALS}"]
       }
    },
    {
@@ -28,10 +26,7 @@
                      "completion": {
                         "completionItem": {
                            "snippetSupport": true,
-                           "documentationFormat": [
-                              "markdown",
-                              "plaintext"
-                           ]
+                           "documentationFormat": ["markdown", "plaintext"]
                         }
                      }
                   },
@@ -42,24 +37,19 @@
             }
          },
          "wait": [
-             {
-                 "jsonrpc": "2.0",
-                 "id": 1,
-                 "result": {
-                     "capabilities": {
-                         "textDocumentSync": 2,
-                         "completionProvider": {
-                             "triggerCharacters": [
-                                 ".",
-                                 ",",
-                                 "'",
-                                 "("
-                             ],
-                             "resolveProvider": true
-                         }
+            {
+               "jsonrpc": "2.0",
+               "id": 1,
+               "result": {
+                  "capabilities": {
+                     "textDocumentSync": 2,
+                     "completionProvider": {
+                        "triggerCharacters": [".", ",", "'", "("],
+                        "resolveProvider": true
                      }
-                 }
-             }
+                  }
+               }
+            }
          ]
       }
    },
@@ -80,23 +70,23 @@
             "params": {
                "settings": {
                   "ada": {
-                     "projectFile":"default.gpr"
+                     "projectFile": "default.gpr"
                   }
                }
             }
          },
          "wait": [
             {
-                "jsonrpc": "2.0",
-                "method": "$/progress",
-                "params": {
+               "jsonrpc": "2.0",
+               "method": "$/progress",
+               "params": {
                   "token": "<ANY>",
                   "value": {
-                    "kind": "end"
+                     "kind": "end"
                   }
-                }
+               }
             }
-        ]
+         ]
       }
    },
    {
@@ -135,7 +125,7 @@
                }
             }
          },
-         "sortReply": { "result": {"items": ["label", "documentation"]} },
+         "sortReply": { "result": { "items": ["label", "documentation"] } },
          "wait": [
             {
                "jsonrpc": "2.0",