Skip to content

Commit c5cbc80

Browse files
AnthonyLeonardoGracioAnthonyLeonardoGracio
committed
Merge branch 'topic/bump_master' into 'master'
Bump edge to master See merge request eng/ide/ada_language_server!1915
2 parents 106630e + a1ace47 commit c5cbc80

File tree

9 files changed

+58
-62
lines changed

9 files changed

+58
-62
lines changed

‎source/ada/lsp-ada_contexts.adb‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -629,24 +629,20 @@ package body LSP.Ada_Contexts is
629629

630630
procedure Process_Closure
631631
(Root : GPR2.Project.View.Object;
632-
Callback : not null access procedure
633-
(View : GPR2.Project.View.Object))
634-
is
632+
Callback :
633+
not null access procedure (View : GPR2.Project.View.Object)) is
635634
begin
636-
-- First process the closure of the view
637-
for View of Root.Closure
638-
(Include_Self => True) when not View.Is_Runtime
635+
-- Process the closure of the root project, including any
636+
-- aggregated library and the projects that it might extend.
637+
for View
638+
of Root.Closure
639+
(Include_Self => True,
640+
Include_Extended => True,
641+
Include_Aggregated => True)
642+
when not View.Is_Runtime
639643
loop
640644
Callback (View);
641645
end loop;
642-
643-
-- If we're looking at an extending view, now
644-
-- process the closure of the extended views.
645-
if Root.Is_Extending then
646-
for V of Root.Extended loop
647-
Process_Closure (V, Callback);
648-
end loop;
649-
end if;
650646
end Process_Closure;
651647

652648
---------------------------

‎testsuite/ada_lsp/project_diags.errors_to_errors/test.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"params": {
5555
"uri": "$URI{test.gpr}",
5656
"diagnostics": [
57-
{
57+
{
5858
"range": {
5959
"start": { "line": 0, "character": 0 },
6060
"end": { "line": 0, "character": 0 }
@@ -77,7 +77,7 @@
7777
}
7878
}
7979
},
80-
"message": "unrecognized attribute \"Foo\""
80+
"message": "undefined attribute \"Foo\""
8181
}
8282
]
8383
}
@@ -88,24 +88,24 @@
8888
}
8989
},
9090
{
91-
"send": {
92-
"request": {
93-
"jsonrpc":"2.0",
94-
"id": 2,
95-
"method":"workspace/executeCommand",
96-
"params":{
97-
"command": "als-project-file",
98-
"arguments": [{}]
99-
}
100-
},
101-
"wait":[
102-
{
103-
"jsonrpc": "2.0",
104-
"id": 2,
105-
"result": "$URI{test.gpr}"
106-
}
107-
]
108-
}
91+
"send": {
92+
"request": {
93+
"jsonrpc": "2.0",
94+
"id": 2,
95+
"method": "workspace/executeCommand",
96+
"params": {
97+
"command": "als-project-file",
98+
"arguments": [{}]
99+
}
100+
},
101+
"wait": [
102+
{
103+
"jsonrpc": "2.0",
104+
"id": 2,
105+
"result": "$URI{test.gpr}"
106+
}
107+
]
108+
}
109109
},
110110
{
111111
"send": {
@@ -121,13 +121,13 @@
121121
}
122122
},
123123
"wait": [
124-
{
124+
{
125125
"jsonrpc": "2.0",
126126
"method": "textDocument/publishDiagnostics",
127127
"params": {
128128
"uri": "$URI{not_visible_project/project_with_errors.gpr}",
129129
"diagnostics": [
130-
{
130+
{
131131
"range": {
132132
"start": { "line": 0, "character": 0 },
133133
"end": { "line": 0, "character": 0 }
@@ -150,7 +150,7 @@
150150
}
151151
}
152152
},
153-
"message": "unrecognized attribute \"Bar\""
153+
"message": "undefined attribute \"Bar\""
154154
}
155155
]
156156
}
@@ -161,24 +161,24 @@
161161
}
162162
},
163163
{
164-
"send": {
165-
"request": {
166-
"jsonrpc":"2.0",
167-
"id": 3,
168-
"method":"workspace/executeCommand",
169-
"params":{
170-
"command": "als-project-file",
171-
"arguments": [{}]
172-
}
173-
},
174-
"wait":[
175-
{
176-
"jsonrpc": "2.0",
177-
"id": 3,
178-
"result": "$URI{not_visible_project/project_with_errors.gpr}"
179-
}
180-
]
181-
}
164+
"send": {
165+
"request": {
166+
"jsonrpc": "2.0",
167+
"id": 3,
168+
"method": "workspace/executeCommand",
169+
"params": {
170+
"command": "als-project-file",
171+
"arguments": [{}]
172+
}
173+
},
174+
"wait": [
175+
{
176+
"jsonrpc": "2.0",
177+
"id": 3,
178+
"result": "$URI{not_visible_project/project_with_errors.gpr}"
179+
}
180+
]
181+
}
182182
},
183183
{
184184
"stop": {

‎testsuite/ada_lsp/project_diags.errors_to_not_found/test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
}
7979
},
80-
"message": "unrecognized attribute \"Foo\""
80+
"message": "undefined attribute \"Foo\""
8181
}
8282
]
8383
}

‎testsuite/ada_lsp/project_diags.errors_to_valid/test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
}
7979
},
80-
"message": "unrecognized attribute \"Foo\""
80+
"message": "undefined attribute \"Foo\""
8181
}
8282
]
8383
}

‎testsuite/ada_lsp/project_diags.errors_to_warning/test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
}
7979
},
80-
"message": "unrecognized attribute \"Foo\""
80+
"message": "undefined attribute \"Foo\""
8181
}
8282
]
8383
}

‎testsuite/ada_lsp/project_diags.multiple_to_errors/test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
}
133133
}
134134
},
135-
"message": "unrecognized attribute \"Bla\""
135+
"message": "undefined attribute \"Bla\""
136136
}
137137
]
138138
}

‎testsuite/ada_lsp/project_diags.no_project_to_errors/test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
}
133133
}
134134
},
135-
"message": "unrecognized attribute \"Bar\""
135+
"message": "undefined attribute \"Bar\""
136136
}
137137
]
138138
}

‎testsuite/ada_lsp/project_diags.not_found_to_errors/test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
}
150150
}
151151
},
152-
"message": "unrecognized attribute \"Bar\""
152+
"message": "undefined attribute \"Bar\""
153153
}
154154
]
155155
}

‎testsuite/ada_lsp/project_diags.warning_to_errors/test.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
}
163163
}
164164
},
165-
"message": "unrecognized attribute \"Bar\""
165+
"message": "undefined attribute \"Bar\""
166166
}
167167
]
168168
}

0 commit comments

Comments
 (0)