Merge branch 'cherry-pick-89e8a0cb' into '25.0'

Merge branch 'mr/25.0/lambourg-update-sources' into 'master' See merge request eng/ide/ada_language_server!1724
eliericha · Oct 7, 2024 · da2500b · da2500b
2 parents 75949bf + 0483c64
commit da2500b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/source/ada/lsp-ada_project_loading.adb b/source/ada/lsp-ada_project_loading.adb
@@ -370,16 +370,9 @@ package body LSP.Ada_Project_Loading is
       --  Special case for a Valid Project: check errors and then warnings
       if Project.Status = Valid_Project then
          if Project.GPR2_Messages.Has_Element
-           (Information => False,
-            Warning     => False,
-            Error       => True,
-            Lint        => False)
-         then
-            Project.Status := Invalid_Project;
-         elsif Project.GPR2_Messages.Has_Element
            (Information => False,
             Warning     => True,
-            Error       => False,
+            Error       => True,
             Lint        => False)
          then
             Project.Status := Valid_Project_With_Warning;

diff --git a/testsuite/ada_lsp/project_config.missing_file/test.json b/testsuite/ada_lsp/project_config.missing_file/test.json
@@ -95,7 +95,7 @@
                                     }
                                  }
                               },
-                              "message": "The project file has errors and could not be loaded."
+                              "message": "The project file was loaded but contains Warnings."
                            },
                            {
                               "location": {

diff --git a/testsuite/gpr_lsp/project_config.alire/hello.gpr b/testsuite/gpr_lsp/project_config.alire/hello.gpr
@@ -1 +1 @@
-with "config/hello_config.gpr";project Hello is end Hello;
+with "config/hello_config.gpr";project Hello is for Source_Dirs use ("src"); end Hello;
diff --git a/testsuite/gpr_lsp/project_config.alire/test.json b/testsuite/gpr_lsp/project_config.alire/test.json
@@ -55,7 +55,7 @@
          "request": {
             "params": {
                "textDocument": {
-                  "text": "with \"config/hello_config.gpr\";project Hello is end Hello;",
+                  "text": "with \"config/hello_config.gpr\";project Hello is for Source_Dirs use (\"src\"); end Hello;",
                   "version": 0,
                   "uri": "$URI{hello.gpr}",
                   "languageId": "Gpr"
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ @@
                                         }
                                      }
                                   },
-                                  "message": "The project file has errors and could not be loaded."
+                                  "message": "The project file was loaded but contains Warnings."
                                },
                                {
                                   "location": {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		with "config/hello_config.gpr";project Hello is end Hello;
		with "config/hello_config.gpr";project Hello is for Source_Dirs use ("src"); end Hello;