Skip to content

Commit da2500b

Browse files
committed
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
2 parents 75949bf + 0483c64 commit da2500b

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

source/ada/lsp-ada_project_loading.adb

+1-8
Original file line numberDiff line numberDiff line change
@@ -370,16 +370,9 @@ package body LSP.Ada_Project_Loading is
370370
-- Special case for a Valid Project: check errors and then warnings
371371
if Project.Status = Valid_Project then
372372
if Project.GPR2_Messages.Has_Element
373-
(Information => False,
374-
Warning => False,
375-
Error => True,
376-
Lint => False)
377-
then
378-
Project.Status := Invalid_Project;
379-
elsif Project.GPR2_Messages.Has_Element
380373
(Information => False,
381374
Warning => True,
382-
Error => False,
375+
Error => True,
383376
Lint => False)
384377
then
385378
Project.Status := Valid_Project_With_Warning;

testsuite/ada_lsp/project_config.missing_file/test.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
}
9696
}
9797
},
98-
"message": "The project file has errors and could not be loaded."
98+
"message": "The project file was loaded but contains Warnings."
9999
},
100100
{
101101
"location": {
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
with "config/hello_config.gpr";project Hello is end Hello;
1+
with "config/hello_config.gpr";project Hello is for Source_Dirs use ("src"); end Hello;

testsuite/gpr_lsp/project_config.alire/test.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"request": {
5656
"params": {
5757
"textDocument": {
58-
"text": "with \"config/hello_config.gpr\";project Hello is end Hello;",
58+
"text": "with \"config/hello_config.gpr\";project Hello is for Source_Dirs use (\"src\"); end Hello;",
5959
"version": 0,
6060
"uri": "$URI{hello.gpr}",
6161
"languageId": "Gpr"

0 commit comments

Comments
 (0)