Show all warnings and errors

Boulanger · Boulanger · commit 001b3686350c · 2024-09-23T15:08:39.000+02:00
- Show them even if there is no file information attached
- Remove defensive code, sending uri for non regular file is fine
- Fix a_range conversion for sloc without source_reference

Adapt tests.

For eng/ide/ada_language_server#1423
diff --git a/source/ada/lsp-ada_project_loading.adb b/source/ada/lsp-ada_project_loading.adb
@@ -120,20 +120,24 @@ package body LSP.Ada_Project_Loading is
      (Project : Project_Status_Type)
       return LSP.Structures.Diagnostic_Vector
    is
+      use GNATCOLL.VFS;
       use LSP.Structures;
 
       Result            : LSP.Structures.Diagnostic_Vector;
       Parent_Diagnostic : LSP.Structures.Diagnostic;
       GPR2_Messages     : GPR2.Log.Object renames Project.GPR2_Messages;
       Project_File      : GNATCOLL.VFS.Virtual_File renames
         Project.Project_File;
-      URI               : constant LSP.Structures.DocumentUri :=
-        (if Project_File.Is_Regular_File
+      Project_URI       : constant LSP.Structures.DocumentUri :=
+        (if Project_File /= No_File
          then
            (VSS.Strings.Conversions.To_Virtual_String
                 (URIs.Conversions.From_File
                      (Project_File.Display_Full_Name)) with null record)
          else "");
+      Backup_Sloc      : constant LSP.Structures.A_Range :=
+           (start  => (0, 0),
+            an_end => (0, 0));
 
       procedure Create_Project_Loading_Diagnostic;
       --  Create a parent diagnostic for the project loading status.
@@ -149,9 +153,6 @@ package body LSP.Ada_Project_Loading is
       ---------------------------------------
 
       procedure Create_Project_Loading_Diagnostic is
-         Sloc : constant LSP.Structures.A_Range :=
-           (start  => (0, 0),
-            an_end => (0, 0));
       begin
          --  Initialize the parent diagnostic.
          Parent_Diagnostic.a_range := ((0, 0), (0, 0));
@@ -164,8 +165,8 @@ package body LSP.Ada_Project_Loading is
            (LSP.Structures.DiagnosticRelatedInformation'
               (location =>
                    LSP.Structures.Location'
-                 (uri     => URI,
-                  a_range => Sloc,
+                 (uri     => Project_URI,
+                  a_range => Backup_Sloc,
                   others  => <>),
                message  =>
                  Load_Status_Message (Project)));
@@ -185,8 +186,7 @@ package body LSP.Ada_Project_Loading is
                   Sloc : constant GPR2.Source_Reference.Object :=
                     GPR2.Message.Sloc (Msg);
                   File : constant GPR2.Path_Name.Object :=
-                    (if Sloc.Is_Defined and then Sloc.Has_Source_Reference
-                     then
+                    (if Sloc.Is_Defined then
                         GPR2.Path_Name.Create_File
                        (GPR2.Filename_Type (Sloc.Filename))
                      else
@@ -235,9 +235,8 @@ package body LSP.Ada_Project_Loading is
             Parent_Diagnostic.relatedInformation.Append
               (LSP.Structures.DiagnosticRelatedInformation'
                  (location =>
-                      (uri     => URI,
-                       a_range => (start  => (0, 0),
-                                   an_end => (0, 0)),
+                      (uri     => Project_URI,
+                       a_range => Backup_Sloc,
                        others  => <>),
                   message  => VSS.Strings.Conversions.To_Virtual_String
                     ("The project was loaded, but no Ada runtime found. "
diff --git a/source/ada/lsp-utils.adb b/source/ada/lsp-utils.adb
@@ -614,7 +614,7 @@ package body LSP.Utils is
            (line      => Natural (Sloc.Line) - 1,
             character => Natural  (Sloc.Column) - 1))
       else
-        (start => (1, 1), an_end => (1, 1)));
+        (start => (0, 0), an_end => (0, 0)));
 
    ------------
    -- To_URI --
diff --git a/testsuite/ada_lsp/project_configured_not_found/test.json b/testsuite/ada_lsp/project_configured_not_found/test.json
@@ -90,7 +90,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{foo_bar.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.errors_to_not_found/test.json b/testsuite/ada_lsp/project_diags.errors_to_not_found/test.json
@@ -154,7 +154,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.multiple_to_not_found/test.json b/testsuite/ada_lsp/project_diags.multiple_to_not_found/test.json
@@ -138,7 +138,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.multiple_to_warning/not_visible_project/project_with_warnings.gpr b/testsuite/ada_lsp/project_diags.multiple_to_warning/not_visible_project/project_with_warnings.gpr
@@ -1,2 +1,3 @@
 project P is
+   for Source_Dirs use ("..");
 end P;
diff --git a/testsuite/ada_lsp/project_diags.no_project_to_not_found/test.json b/testsuite/ada_lsp/project_diags.no_project_to_not_found/test.json
@@ -138,7 +138,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.not_found_to_errors/test.json b/testsuite/ada_lsp/project_diags.not_found_to_errors/test.json
@@ -82,7 +82,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.not_found_to_not_found/test.json b/testsuite/ada_lsp/project_diags.not_found_to_not_found/test.json
@@ -82,7 +82,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
@@ -155,7 +155,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project2.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.not_found_to_valid/test.json b/testsuite/ada_lsp/project_diags.not_found_to_valid/test.json
@@ -82,7 +82,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.not_found_to_warning/test.json b/testsuite/ada_lsp/project_diags.not_found_to_warning/test.json
@@ -82,7 +82,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,
diff --git a/testsuite/ada_lsp/project_diags.warning_to_not_found/test.json b/testsuite/ada_lsp/project_diags.warning_to_not_found/test.json
@@ -154,7 +154,7 @@
                         "relatedInformation": [
                            {
                               "location": {
-                                 "uri": "",
+                                 "uri": "$URI{no_project.gpr}",
                                  "range": {
                                     "start": {
                                        "line": 0,

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@`
`90`	`90`	`"relatedInformation": [`
`91`	`91`	`{`
`92`	`92`	`"location": {`
`93`		`- "uri": "",`
	`93`	`+ "uri": "$URI{foo_bar.gpr}",`
`94`	`94`	`"range": {`
`95`	`95`	`"start": {`
`96`	`96`	`"line": 0,`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@`
`154`	`154`	`"relatedInformation": [`
`155`	`155`	`{`
`156`	`156`	`"location": {`
`157`		`- "uri": "",`
	`157`	`+ "uri": "$URI{no_project.gpr}",`
`158`	`158`	`"range": {`
`159`	`159`	`"start": {`
`160`	`160`	`"line": 0,`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@`
`138`	`138`	`"relatedInformation": [`
`139`	`139`	`{`
`140`	`140`	`"location": {`
`141`		`- "uri": "",`
	`141`	`+ "uri": "$URI{no_project.gpr}",`
`142`	`142`	`"range": {`
`143`	`143`	`"start": {`
`144`	`144`	`"line": 0,`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`project P is`
	`2`	`+ for Source_Dirs use ("..");`
`2`	`3`	`end P;`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@`
`82`	`82`	`"relatedInformation": [`
`83`	`83`	`{`
`84`	`84`	`"location": {`
`85`		`- "uri": "",`
	`85`	`+ "uri": "$URI{no_project.gpr}",`
`86`	`86`	`"range": {`
`87`	`87`	`"start": {`
`88`	`88`	`"line": 0,`