Skip to content

Commit ade75be

Browse files
settonsetton
committed
Merge branch 'mr/baselines' into 'edge'
Adjust baselines for tests on edge See merge request eng/ide/ada_language_server!1766
2 parents f2e0ff6 + 796c8b5 commit ade75be

File tree

3 files changed

+98
-99
lines changed

3 files changed

+98
-99
lines changed

‎testsuite/ada_lsp/SB21-042.tooltips.aspects/test.json

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
[
22
{
3-
"comment": [
4-
"test automatically generated"
5-
]
3+
"comment": ["test automatically generated"]
64
},
75
{
86
"start": {
9-
"cmd": [
10-
"${ALS}"
11-
]
7+
"cmd": ["${ALS}"]
128
}
139
},
1410
{
@@ -110,8 +106,8 @@
110106
},
111107
"at foo.adb (3:4)",
112108
{
113-
"language": "ada",
114-
"value": " Alignment => (8)"
109+
"language": "ada",
110+
"value": " Alignment => (8)"
115111
}
116112
]
117113
}
@@ -149,7 +145,6 @@
149145
"language": "ada",
150146
"value": " Alignment => (8)"
151147
}
152-
153148
]
154149
}
155150
}
@@ -178,10 +173,10 @@
178173
"result": {
179174
"contents": [
180175
{
181-
"value": "type Integer is range -(2 ** 31) .. +(2 ** 31 - 1);",
182-
"language": "ada"
176+
"language": "ada",
177+
"value": "type Integer is range -16#8000_0000# .. 16#7fff_ffff#;"
183178
},
184-
"at __standard (4:3)"
179+
"at __standard (6:4)"
185180
]
186181
}
187182
}

‎testsuite/ada_lsp/V705-026.completion.predefined_types/test.json

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
},
99
{
1010
"start": {
11-
"cmd": [
12-
"${ALS}"
13-
]
11+
"cmd": ["${ALS}"]
1412
}
1513
},
1614
{
@@ -27,9 +25,7 @@
2725
"applyEdit": true,
2826
"workspaceEdit": {
2927
"documentChanges": true,
30-
"resourceOperations": [
31-
"rename"
32-
]
28+
"resourceOperations": ["rename"]
3329
}
3430
},
3531
"textDocument": {
@@ -38,15 +34,9 @@
3834
"dynamicRegistration": true,
3935
"completionItem": {
4036
"snippetSupport": false,
41-
"documentationFormat": [
42-
"plaintext",
43-
"markdown"
44-
],
37+
"documentationFormat": ["plaintext", "markdown"],
4538
"resolveSupport": {
46-
"properties": [
47-
"detail",
48-
"documentation"
49-
]
39+
"properties": ["detail", "documentation"]
5040
}
5141
}
5242
},
@@ -82,12 +72,7 @@
8272
"capabilities": {
8373
"textDocumentSync": 2,
8474
"completionProvider": {
85-
"triggerCharacters": [
86-
".",
87-
",",
88-
"'",
89-
"("
90-
],
75+
"triggerCharacters": [".", ",", "'", "("],
9176
"resolveProvider": true
9277
}
9378
}
@@ -205,10 +190,10 @@
205190
"insertTextFormat": 1
206191
},
207192
{
208-
"label": "Integer",
193+
"detail": "type Integer is range -16#8000_0000# .. 16#7fff_ffff#;",
194+
"documentation": "at __standard (6:4)",
209195
"kind": 7,
210-
"detail": "type Integer is range -(2 ** 31) .. +(2 ** 31 - 1);",
211-
"documentation": "at __standard (4:3)",
196+
"label": "Integer",
212197
"sortText": "00&00002Integer"
213198
}
214199
]

‎testsuite/gpr_lsp/gnatcheck_attributes/test.json

Lines changed: 83 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,85 @@
11
[
22
{
3-
"comment": [
4-
"Test attribute checking for the GNATcheck package"
5-
]
6-
},
3+
"comment": ["Test attribute checking for the GNATcheck package"]
4+
},
75
{
86
"start": {
9-
"cmd": ["${ALS}", "--language-gpr"]
7+
"cmd": ["${ALS}", "--language-gpr"]
108
}
11-
},
9+
},
1210
{
1311
"send": {
1412
"request": {
1513
"params": {
16-
"capabilities": {
17-
},
14+
"capabilities": {},
1815
"rootUri": "$URI{.}"
19-
},
20-
"id": 1,
21-
"method": "initialize"
22-
},
23-
"wait": [{
16+
},
2417
"id": 1,
25-
"result": {
26-
"capabilities": {
27-
"textDocumentSync": {
28-
"openClose": true,
29-
"change": 1
18+
"method": "initialize"
19+
},
20+
"wait": [
21+
{
22+
"id": 1,
23+
"result": {
24+
"capabilities": {
25+
"textDocumentSync": {
26+
"openClose": true,
27+
"change": 1
28+
}
3029
}
31-
}
32-
}
33-
}]
34-
}
35-
},
30+
}
31+
}
32+
]
33+
}
34+
},
3635
{
3736
"send": {
3837
"request": {
39-
"jsonrpc": "2.0",
38+
"jsonrpc": "2.0",
4039
"method": "initialized"
41-
},
40+
},
4241
"wait": []
4342
}
44-
},
43+
},
4544
{
4645
"send": {
4746
"request": {
4847
"params": {
4948
"textDocument": {
50-
"text": "project prj is\n package Check is\n for Default_Switches (\"ada\") use (\"-j8\");\n for Switches (\"ada\") use (\"-k\");\n end Check;\nend prj;",
51-
"version": 0,
52-
"uri": "$URI{prj.gpr}",
49+
"text": "project prj is\n package Check is\n for Default_Switches (\"ada\") use (\"-j8\");\n for Switches (\"ada\") use (\"-k\");\n end Check;\nend prj;",
50+
"version": 0,
51+
"uri": "$URI{prj.gpr}",
5352
"languageId": "Gpr"
5453
}
55-
},
56-
"jsonrpc": "2.0",
54+
},
55+
"jsonrpc": "2.0",
5756
"method": "textDocument/didOpen"
58-
},
59-
"wait": [{
60-
"method": "textDocument/publishDiagnostics",
61-
"params": {
62-
"uri": "$URI{prj.gpr}",
63-
"diagnostics": []
57+
},
58+
"wait": [
59+
{
60+
"method": "textDocument/publishDiagnostics",
61+
"params": {
62+
"uri": "$URI{prj.gpr}",
63+
"diagnostics": [
64+
{
65+
"message": "there are no sources of language \"Ada\" in this project",
66+
"range": {
67+
"end": {
68+
"character": 0,
69+
"line": 0
70+
},
71+
"start": {
72+
"character": 0,
73+
"line": 0
74+
}
75+
},
76+
"severity": 2,
77+
"source": "project"
78+
}
79+
]
80+
}
6481
}
65-
}]
82+
]
6683
}
6784
},
6885
{
@@ -92,45 +109,47 @@
92109
]
93110
}
94111
},
95-
"wait": [{
96-
"method": "textDocument/publishDiagnostics",
97-
"params": {
98-
"uri": "$URI{prj.gpr}",
99-
"diagnostics": [
100-
{
101-
"range": {
102-
"start": {
103-
"line": 2,
104-
"character": 6
105-
},
106-
"end": {
107-
"line": 2,
108-
"character": 6
109-
}
110-
},
111-
"severity": 1,
112-
"message": "full associative array expression requires simple attribute reference"
113-
}
114-
]
112+
"wait": [
113+
{
114+
"method": "textDocument/publishDiagnostics",
115+
"params": {
116+
"uri": "$URI{prj.gpr}",
117+
"diagnostics": [
118+
{
119+
"range": {
120+
"start": {
121+
"line": 2,
122+
"character": 6
123+
},
124+
"end": {
125+
"line": 2,
126+
"character": 6
127+
}
128+
},
129+
"severity": 1,
130+
"message": "full associative array expression requires simple attribute reference"
131+
}
132+
]
133+
}
115134
}
116-
}]
135+
]
117136
}
118137
},
119138
{
120139
"send": {
121140
"request": {
122-
"jsonrpc": "2.0",
123-
"id": 7,
141+
"jsonrpc": "2.0",
142+
"id": 7,
124143
"method": "shutdown"
125-
},
144+
},
126145
"wait": [
127146
{
128-
"id": 7,
147+
"id": 7,
129148
"result": null
130149
}
131150
]
132151
}
133-
},
152+
},
134153
{
135154
"stop": {
136155
"exit_code": 0

0 commit comments

Comments
 (0)