Merge branch 'topic/#1553' into 'edge'

AnthonyLeonardoGracio · AnthonyLeonardoGracio · commit f60773a52b10 · 2024-12-06T11:53:33.000Z
Adapt to new GPR2 messages

See merge request eng/ide/ada_language_server!1841
diff --git a/testsuite/ada_lsp/project_diags.errors_to_errors/test.json b/testsuite/ada_lsp/project_diags.errors_to_errors/test.json
@@ -54,7 +54,7 @@
                "params": {
                   "uri": "$URI{main.adb}",
                   "diagnostics": [
-                       {
+                     {
                         "range": {
                            "start": { "line": 0, "character": 0 },
                            "end": { "line": 0, "character": 0 }
@@ -77,7 +77,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Foo\""
+                              "message": "undefined attribute \"Foo\""
                            }
                         ]
                      }
@@ -88,24 +88,24 @@
       }
    },
    {
-        "send": {
-            "request": {
-                "jsonrpc":"2.0",
-                "id": 2,
-                "method":"workspace/executeCommand",
-                "params":{
-                    "command": "als-project-file",
-                    "arguments": [{}]
-                }
-            },
-            "wait":[
-                {
-                    "jsonrpc": "2.0",
-                    "id": 2,
-                    "result": "$URI{test.gpr}"
-                }
-            ]
-        }
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "id": 2,
+            "method": "workspace/executeCommand",
+            "params": {
+               "command": "als-project-file",
+               "arguments": [{}]
+            }
+         },
+         "wait": [
+            {
+               "jsonrpc": "2.0",
+               "id": 2,
+               "result": "$URI{test.gpr}"
+            }
+         ]
+      }
    },
    {
       "send": {
@@ -121,13 +121,13 @@
             }
          },
          "wait": [
-           {
+            {
                "jsonrpc": "2.0",
                "method": "textDocument/publishDiagnostics",
                "params": {
                   "uri": "$URI{main.adb}",
                   "diagnostics": [
-                       {
+                     {
                         "range": {
                            "start": { "line": 0, "character": 0 },
                            "end": { "line": 0, "character": 0 }
@@ -150,7 +150,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Bar\""
+                              "message": "undefined attribute \"Bar\""
                            }
                         ]
                      }
@@ -161,24 +161,24 @@
       }
    },
    {
-        "send": {
-            "request": {
-                "jsonrpc":"2.0",
-                "id": 3,
-                "method":"workspace/executeCommand",
-                "params":{
-                    "command": "als-project-file",
-                    "arguments": [{}]
-                }
-            },
-            "wait":[
-                {
-                    "jsonrpc": "2.0",
-                    "id": 3,
-                    "result": "$URI{not_visible_project/project_with_errors.gpr}"
-                }
-            ]
-        }
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "id": 3,
+            "method": "workspace/executeCommand",
+            "params": {
+               "command": "als-project-file",
+               "arguments": [{}]
+            }
+         },
+         "wait": [
+            {
+               "jsonrpc": "2.0",
+               "id": 3,
+               "result": "$URI{not_visible_project/project_with_errors.gpr}"
+            }
+         ]
+      }
    },
    {
       "stop": {
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
@@ -77,7 +77,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Foo\""
+                              "message": "undefined attribute \"Foo\""
                            }
                         ]
                      }
diff --git a/testsuite/ada_lsp/project_diags.errors_to_valid/test.json b/testsuite/ada_lsp/project_diags.errors_to_valid/test.json
@@ -77,7 +77,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Foo\""
+                              "message": "undefined attribute \"Foo\""
                            }
                         ]
                      }
diff --git a/testsuite/ada_lsp/project_diags.errors_to_warning/test.json b/testsuite/ada_lsp/project_diags.errors_to_warning/test.json
@@ -77,7 +77,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Foo\""
+                              "message": "undefined attribute \"Foo\""
                            }
                         ]
                      }
diff --git a/testsuite/ada_lsp/project_diags.multiple_to_errors/test.json b/testsuite/ada_lsp/project_diags.multiple_to_errors/test.json
@@ -132,7 +132,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Bla\""
+                              "message": "undefined attribute \"Bla\""
                            }
                         ]
                      }
diff --git a/testsuite/ada_lsp/project_diags.no_project_to_errors/test.json b/testsuite/ada_lsp/project_diags.no_project_to_errors/test.json
@@ -132,7 +132,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Bar\""
+                              "message": "undefined attribute \"Bar\""
                            }
                         ]
                      }
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
@@ -149,7 +149,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Bar\""
+                              "message": "undefined attribute \"Bar\""
                            }
                         ]
                      }
diff --git a/testsuite/ada_lsp/project_diags.warning_to_errors/test.json b/testsuite/ada_lsp/project_diags.warning_to_errors/test.json
@@ -164,7 +164,7 @@
                                     }
                                  }
                               },
-                              "message": "unrecognized attribute \"Bar\""
+                              "message": "undefined attribute \"Bar\""
                            }
                         ]
                      }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`},`
`80`		`- "message": "unrecognized attribute \"Foo\""`
	`80`	`+ "message": "undefined attribute \"Foo\""`
`81`	`81`	`}`
`82`	`82`	`]`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`},`
`135`		`- "message": "unrecognized attribute \"Bla\""`
	`135`	`+ "message": "undefined attribute \"Bla\""`
`136`	`136`	`}`
`137`	`137`	`]`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`},`
`152`		`- "message": "unrecognized attribute \"Bar\""`
	`152`	`+ "message": "undefined attribute \"Bar\""`
`153`	`153`	`}`
`154`	`154`	`]`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`},`
`167`		`- "message": "unrecognized attribute \"Bar\""`
	`167`	`+ "message": "undefined attribute \"Bar\""`
`168`	`168`	`}`
`169`	`169`	`]`
`170`	`170`	`}`