Skip to content

Commit 9df2f60

Browse files
AnthonyLeonardoGracioAnthonyLeonardoGracio
committed
Merge branch 'topic/codeactions' into 'master'
Fix regressions in ALS testsuite See merge request eng/ide/ada_language_server!2121
2 parents 9b70320 + 54f0b0e commit 9df2f60

File tree

2 files changed

+62
-84
lines changed
  • testsuite/ada_lsp

2 files changed

+62
-84
lines changed

‎testsuite/ada_lsp/refactoring_replace_type/Q817-007/test.json‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
},
77
{
88
"start": {
9-
"cmd": [
10-
"${ALS}"
11-
]
9+
"cmd": ["${ALS}"]
1210
}
1311
},
1412
{
@@ -27,11 +25,7 @@
2725
"applyEdit": true,
2826
"workspaceEdit": {
2927
"documentChanges": true,
30-
"resourceOperations": [
31-
"create",
32-
"rename",
33-
"delete"
34-
]
28+
"resourceOperations": ["create", "rename", "delete"]
3529
},
3630
"executeCommand": {
3731
"dynamicRegistration": true
@@ -53,9 +47,7 @@
5347
}
5448
},
5549
"experimental": {
56-
"advanced_refactorings": [
57-
"replace_type"
58-
]
50+
"advanced_refactorings": ["replace_type"]
5951
}
6052
}
6153
}
@@ -67,16 +59,10 @@
6759
"result": {
6860
"capabilities": {
6961
"codeActionProvider": {
70-
"codeActionKinds": [
71-
"<HAS>",
72-
"refactor.rewrite"
73-
]
62+
"codeActionKinds": ["<HAS>", "refactor.rewrite"]
7463
},
7564
"executeCommandProvider": {
76-
"commands": [
77-
"<HAS>",
78-
"als-refactor-replace-type"
79-
]
65+
"commands": ["<HAS>", "als-refactor-replace-type"]
8066
}
8167
}
8268
}
@@ -107,15 +93,15 @@
10793
}
10894
},
10995
"wait": [
110-
{
111-
"jsonrpc": "2.0",
112-
"id": 1,
113-
"method": "window/workDoneProgress/create",
114-
"params": {
115-
"token": "<ANY>"
116-
}
117-
}
118-
]
96+
{
97+
"jsonrpc": "2.0",
98+
"id": 1,
99+
"method": "window/workDoneProgress/create",
100+
"params": {
101+
"token": "<ANY>"
102+
}
103+
}
104+
]
119105
}
120106
},
121107
{
@@ -191,6 +177,7 @@
191177
{
192178
"id": 1,
193179
"result": [
180+
"<HAS>",
194181
{
195182
"title": "Replace Type",
196183
"kind": "refactor.rewrite",

‎testsuite/ada_lsp/refactoring_sort_dependencies/SA22-035/test.json‎

Lines changed: 47 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
},
77
{
88
"start": {
9-
"cmd": [
10-
"${ALS}"
11-
]
9+
"cmd": ["${ALS}"]
1210
}
1311
},
1412
{
@@ -27,11 +25,7 @@
2725
"applyEdit": true,
2826
"workspaceEdit": {
2927
"documentChanges": true,
30-
"resourceOperations": [
31-
"create",
32-
"rename",
33-
"delete"
34-
]
28+
"resourceOperations": ["create", "rename", "delete"]
3529
},
3630
"executeCommand": {
3731
"dynamicRegistration": true
@@ -54,9 +48,7 @@
5448
}
5549
},
5650
"experimental": {
57-
"advanced_refactorings": [
58-
"replace_type"
59-
]
51+
"advanced_refactorings": ["replace_type"]
6052
}
6153
}
6254
}
@@ -68,16 +60,10 @@
6860
"result": {
6961
"capabilities": {
7062
"codeActionProvider": {
71-
"codeActionKinds": [
72-
"<HAS>",
73-
"source.organizeImports"
74-
]
63+
"codeActionKinds": ["<HAS>", "source.organizeImports"]
7564
},
7665
"executeCommandProvider": {
77-
"commands": [
78-
"<HAS>",
79-
"als-refactor-sort_dependencies"
80-
]
66+
"commands": ["<HAS>", "als-refactor-sort_dependencies"]
8167
}
8268
}
8369
}
@@ -108,14 +94,14 @@
10894
}
10995
},
11096
"wait": [
111-
{
112-
"jsonrpc": "2.0",
113-
"id": 1,
114-
"method": "window/workDoneProgress/create",
115-
"params": {
116-
"token": "<ANY>"
117-
}
118-
}
97+
{
98+
"jsonrpc": "2.0",
99+
"id": 1,
100+
"method": "window/workDoneProgress/create",
101+
"params": {
102+
"token": "<ANY>"
103+
}
104+
}
119105
]
120106
}
121107
},
@@ -176,28 +162,31 @@
176162
"jsonrpc": "2.0",
177163
"id": 1,
178164
"result": [
165+
"<HAS>",
179166
{
180167
"title": "Sort Dependencies",
181168
"kind": "source.organizeImports",
182169
"command": {
183170
"title": "",
184171
"command": "als-refactor-sort_dependencies",
185-
"arguments": [{
186-
"context": "$URI{default.gpr}",
187-
"where": {
188-
"uri": "$URI{main_package.ads}",
189-
"range": {
190-
"start": {
191-
"line": 3,
192-
"character": 15
193-
},
194-
"end": {
195-
"line": 3,
196-
"character": 15
197-
}
198-
}
199-
}
200-
}]
172+
"arguments": [
173+
{
174+
"context": "$URI{default.gpr}",
175+
"where": {
176+
"uri": "$URI{main_package.ads}",
177+
"range": {
178+
"start": {
179+
"line": 3,
180+
"character": 15
181+
},
182+
"end": {
183+
"line": 3,
184+
"character": 15
185+
}
186+
}
187+
}
188+
}
189+
]
201190
}
202191
}
203192
]
@@ -213,22 +202,24 @@
213202
"method": "workspace/executeCommand",
214203
"params": {
215204
"command": "als-refactor-sort_dependencies",
216-
"arguments": [{
217-
"context": "$URI{default.gpr}",
218-
"where": {
219-
"uri": "$URI{main_package.ads}",
220-
"range": {
221-
"start": {
222-
"line": 3,
223-
"character": 15
224-
},
225-
"end": {
226-
"line": 3,
227-
"character": 15
205+
"arguments": [
206+
{
207+
"context": "$URI{default.gpr}",
208+
"where": {
209+
"uri": "$URI{main_package.ads}",
210+
"range": {
211+
"start": {
212+
"line": 3,
213+
"character": 15
214+
},
215+
"end": {
216+
"line": 3,
217+
"character": 15
218+
}
228219
}
229220
}
230221
}
231-
}]
222+
]
232223
}
233224
},
234225
"wait": [

0 commit comments

Comments
 (0)