Merge remote branch 'origin/master' into edge

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

Author: mergerepo

source/client/lsp-raw_clients.adb

@@ -71,7 +71,7 @@ package body LSP.Raw_Clients is
 
    function Is_Server_Running (Self : Raw_Client'Class) return Boolean is
    begin
-      return Self.Server.Status in Spawn.Processes.Running;
+      return Self.Server.Status in Spawn.Running;
    end Is_Server_Running;
 
    -------------------------------

source/tester/tester-tests.adb

@@ -204,7 +204,7 @@ package body Tester.Tests is
       Self.Send_Message (Text);
 
       loop
-         Spawn.Processes.Monitor_Loop (Timeout => 100);
+         Spawn.Processes.Monitor_Loop (Timeout => 0.1);
          exit when GNATCOLL.JSON.Length (Self.Waits) = 0;
 
          if Ada.Calendar.Clock - Self.Started > Timeout
@@ -408,7 +408,7 @@ package body Tester.Tests is
       Listener.Process.Close_Standard_Error;
 
       loop
-         Spawn.Processes.Monitor_Loop (Timeout => 10);
+         Spawn.Processes.Monitor_Loop (Timeout => 0.01);
          exit when Listener.Done;
       end loop;
 
@@ -469,7 +469,7 @@ package body Tester.Tests is
       Self.Start;
 
       loop
-         Spawn.Processes.Monitor_Loop (Timeout => 1);
+         Spawn.Processes.Monitor_Loop (Timeout => 0.001);
          exit when Self.Is_Server_Running;
       end loop;
 
@@ -511,7 +511,7 @@ package body Tester.Tests is
       end if;
 
       loop
-         Spawn.Processes.Monitor_Loop (Timeout => 1);
+         Spawn.Processes.Monitor_Loop (Timeout => 0.001);
          exit when not Self.Is_Server_Running;
       end loop;
 

testsuite/ada_lsp/T713-012.completion.generic_package/test.json

@@ -641,7 +641,15 @@
                }
             }
          },
-         "wait": []
+         "wait": [
+            {
+               "method": "textDocument/publishDiagnostics",
+               "params": {
+                  "uri": "$URI{src/inst.ads}",
+                  "diagnostics": []
+               }
+            }
+         ]
       }
    },
    {
@@ -652,13 +660,6 @@
             "method": "shutdown"
          },
          "wait": [
-            {
-               "method": "textDocument/publishDiagnostics",
-               "params": {
-                  "uri": "$URI{src/inst.ads}",
-                  "diagnostics": []
-               }
-            },
             {
                "id": 51,
                "result": null

testsuite/ada_lsp/V628-024.symbol_diff/test.json

@@ -226,11 +226,19 @@
             "method": "textDocument/didClose",
             "params": {
                "textDocument": {
-                  "uri": "file:///home/ogorodnik/adacore/tests/hello/src/main.adb"
+                  "uri": "$URI{main.adb}"
                }
             }
          },
-         "wait": []
+         "wait": [
+            {
+               "method": "textDocument/publishDiagnostics",
+               "params": {
+                  "uri": "$URI{main.adb}",
+                  "diagnostics": []
+               }
+            }
+         ]
       }
    },
    {
@@ -241,13 +249,6 @@
             "method": "shutdown"
          },
          "wait": [
-            {
-               "method": "textDocument/publishDiagnostics",
-               "params": {
-                  "uri": "file:///home/ogorodnik/adacore/tests/hello/src/main.adb",
-                  "diagnostics": []
-               }
-            },
             {
                "id": 9,
                "result": null

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

@@ -399,7 +399,15 @@
                }
             }
          },
-         "wait": []
+         "wait": [
+            {
+               "method": "textDocument/publishDiagnostics",
+               "params": {
+                  "uri": "$URI{foo.adb}",
+                  "diagnostics": []
+               }
+            }
+         ]
       }
    },
    {
@@ -410,13 +418,6 @@
             "method": "shutdown"
          },
          "wait": [
-            {
-               "method": "textDocument/publishDiagnostics",
-               "params": {
-                  "uri": "$URI{foo.adb}",
-                  "diagnostics": []
-               }
-            },
             {
                "id": 53,
                "result": null

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

@@ -416,7 +416,15 @@
                }
             }
          },
-         "wait": []
+         "wait": [
+            {
+               "method": "textDocument/publishDiagnostics",
+               "params": {
+                  "uri": "$URI{foo.adb}",
+                  "diagnostics": []
+               }
+            }
+         ]
       }
    },
    {
@@ -427,13 +435,6 @@
             "method": "shutdown"
          },
          "wait": [
-            {
-               "method": "textDocument/publishDiagnostics",
-               "params": {
-                  "uri": "$URI{foo.adb}",
-                  "diagnostics": []
-               }
-            },
             {
                "id": 31,
                "result": null

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

@@ -357,7 +357,15 @@
                }
             }
          },
-         "wait": []
+         "wait": [
+            {
+               "method": "textDocument/publishDiagnostics",
+               "params": {
+                  "uri": "$URI{foo.adb}",
+                  "diagnostics": []
+               }
+            }
+         ]
       }
    },
    {
@@ -368,13 +376,6 @@
             "method": "shutdown"
          },
          "wait": [
-            {
-               "method": "textDocument/publishDiagnostics",
-               "params": {
-                  "uri": "$URI{foo.adb}",
-                  "diagnostics": []
-               }
-            },
             {
                "id": 16,
                "result": null

testsuite/ada_lsp/incorrect_fallback/incorrect_fallback.json

@@ -236,7 +236,12 @@
             "id": 2,
             "method": "shutdown"
          },
-         "wait": []
+         "wait": [
+            {
+               "id": 2,
+               "result": null
+            }
+         ]
       }
    },
    {
@@ -246,12 +251,7 @@
             "jsonrpc": "2.0",
             "method": "exit"
          },
-         "wait": [
-            {
-               "id": 2,
-               "result": null
-            }
-         ]
+         "wait": []
       }
    },
    {