Merge remote branch 'origin/master' into edge

Author: automatic-merge

testsuite/ada_lsp/scenario_variables/pkg.ads

@@ -0,0 +1,3 @@
+package Pkg is
+   pragma Pure;
+end Pkg;

testsuite/ada_lsp/scenario_variables/prj.gpr

@@ -0,0 +1,3 @@
+project Prj is
+    Var := external("VAR");
+end Prj;

testsuite/ada_lsp/scenario_variables/test.json

@@ -0,0 +1,125 @@
+[
+   {
+      "comment": [
+         "This test uses ada.scenarioVariables and checks that the project is loaded without diagnostics."
+      ]
+   },
+   {
+      "start": {
+         "cmd": ["${ALS}"]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "id": 0,
+            "method": "initialize",
+            "params": {
+               "rootUri": "$URI{.}"
+            }
+         },
+         "wait": []
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "method": "initialized",
+            "params": {}
+         },
+         "wait": []
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "method": "textDocument/didOpen",
+            "params": {
+               "textDocument": {
+                  "uri": "$URI{pkg.ads}",
+                  "languageId": "ada",
+                  "version": 1,
+                  "text": "package Pkg is\n   pragma Pure;\nend Pkg;"
+               }
+            }
+         },
+         "wait": [
+            {
+               "method": "textDocument/publishDiagnostics",
+               "params": {
+                  "uri": "$URI{pkg.ads}",
+                  "diagnostics": [
+                     {
+                        "range": {
+                           "start": {
+                              "line": 0,
+                              "character": 0
+                           },
+                           "end": {
+                              "line": 0,
+                              "character": 0
+                           }
+                        },
+                        "severity": 1,
+                        "source": "ada.project",
+                        "message": "The project file has errors and could not be loaded.",
+                        "relatedInformation": [
+                           {
+                              "location": {
+                                 "uri": "$URI{prj.gpr}",
+                                 "range": {
+                                    "start": {
+                                       "line": 1,
+                                       "character": 20
+                                    },
+                                    "end": {
+                                       "line": 1,
+                                       "character": 20
+                                    }
+                                 }
+                              },
+                              "message": "undefined external reference \"VAR\""
+                           }
+                        ]
+                     }
+                  ]
+               }
+            }
+         ]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "method": "workspace/didChangeConfiguration",
+            "params": {
+               "settings": {
+                  "ada": {
+                     "scenarioVariables": {
+                        "Var": "value"
+                     }
+                  }
+               }
+            }
+         },
+         "wait": [
+            {
+               "method": "textDocument/publishDiagnostics",
+               "params": {
+                  "uri": "$URI{pkg.ads}",
+                  "diagnostics": []
+               }
+            }
+         ]
+      }
+   },
+   {
+      "stop": {
+         "exit_code": 0
+      }
+   }
+]

testsuite/ada_lsp/scenario_variables/test.yaml

@@ -0,0 +1,3 @@
+title: 'scenario_variables'
+control:
+  - [XFAIL, "True", "bug in loading projects with scenario variables eng/ide/ada_language_server#1479"]

testsuite/drivers/lsp_python_driver.py

@@ -120,7 +120,7 @@ def __init__(
 
         # Kill the server when we reach this time
         self.kill_me_at = time.time() + int(
-            RLIMIT_SECONDS * os.environ.get("ALS_WAIT_FACTOR", 1.0)
+            RLIMIT_SECONDS * float(os.environ.get("ALS_WAIT_FACTOR", "1.0"))
         )
 
         # This contains either None or a timestamp. If a timestamp,