Skip to content

Commit 257e79c

Browse files
author
mergerepo
committed
Merge remote branch 'origin/master' into edge
(no-precommit-check no-tn-check)
2 parents b0e1d05 + 689a961 commit 257e79c

File tree

6 files changed

+199
-19
lines changed

6 files changed

+199
-19
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ clean:
122122
rm -rf integration/vscode/ada/$(PLATFORM)
123123

124124
vscode:
125-
cd integration/vscode/ada; npm install && npm run compile
125+
cd integration/vscode/ada; LD_LIBRARY_PATH= npm install && npm run compile
126126
@echo Now run:
127127
@echo code --extensionDevelopmentPath=`pwd`/integration/vscode/ada/ `pwd`
128128

‎integration/vscode/ada/src/gprTaskProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const getGprTasks = (): vscode.Task[] => {
8080
shell,
8181
'$ada'
8282
);
83-
task.group = { kind: vscode.TaskGroup.Build, isDefault: true };
83+
task.group = vscode.TaskGroup.Build;
8484
result.push(task);
8585
// Check semantic in the current file
8686
const kind_check = {

‎source/ada/lsp-ada_handlers.adb‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,8 @@ package body LSP.Ada_Handlers is
786786
completionItem.Value.resolveSupport.Value.properties;
787787
end if;
788788

789-
if Value.capabilities.workspace.didChangeWatchedFiles
789+
if Value.capabilities.workspace.didChangeWatchedFiles.Is_Set
790+
and then Value.capabilities.workspace.didChangeWatchedFiles.Value
790791
.dynamicRegistration = True
791792
then
792793
Self.File_Monitor := new LSP.Client_Side_File_Monitors.File_Monitor
@@ -3326,8 +3327,9 @@ package body LSP.Ada_Handlers is
33263327
-- Register rangeFormatting provider is the client supports
33273328
-- dynamic registration for it (and we haven't done it before).
33283329
if not Self.Range_Formatting_Enabled
3329-
and then Self.Client.capabilities.textDocument.rangeFormatting
3330-
.dynamicRegistration = True
3330+
and then Self.Client.capabilities.textDocument.rangeFormatting.Is_Set
3331+
and then Self.Client.capabilities.textDocument.rangeFormatting.Value
3332+
.dynamicRegistration = True
33313333
then
33323334
declare
33333335
Request : LSP.Messages.Client_Requests.RegisterCapability_Request;

‎source/protocol/lsp-messages.ads‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,6 +1656,12 @@ package LSP.Messages is
16561656
for dynamicRegistration'Read use Read_dynamicRegistration;
16571657
for dynamicRegistration'Write use Write_dynamicRegistration;
16581658

1659+
package Optional_dynamicRegistrations is
1660+
new LSP.Generic_Optional (dynamicRegistration);
1661+
1662+
type Optional_dynamicRegistration is
1663+
new Optional_dynamicRegistrations.Optional_Type;
1664+
16591665
--
16601666
--```typescript
16611667
--export interface WorkspaceEditClientCapabilities {
@@ -1860,7 +1866,8 @@ package LSP.Messages is
18601866
-- dynamicRegistration?: boolean;
18611867
--}
18621868
--```
1863-
subtype DidChangeConfigurationClientCapabilities is dynamicRegistration;
1869+
subtype DidChangeConfigurationClientCapabilities
1870+
is Optional_dynamicRegistration;
18641871

18651872
--```typescript
18661873
--export interface DidChangeWatchedFilesClientCapabilities {
@@ -1872,7 +1879,8 @@ package LSP.Messages is
18721879
-- dynamicRegistration?: boolean;
18731880
--}
18741881
--```
1875-
subtype DidChangeWatchedFilesClientCapabilities is dynamicRegistration;
1882+
subtype DidChangeWatchedFilesClientCapabilities
1883+
is Optional_dynamicRegistration;
18761884

18771885
--```typescript
18781886
--interface WorkspaceSymbolClientCapabilities {
@@ -2083,7 +2091,7 @@ package LSP.Messages is
20832091
-- dynamicRegistration?: boolean;
20842092
--}
20852093
--```
2086-
subtype ExecuteCommandClientCapabilities is dynamicRegistration;
2094+
subtype ExecuteCommandClientCapabilities is Optional_dynamicRegistration;
20872095

20882096
--```typescript
20892097
--export interface SemanticTokensWorkspaceClientCapabilities {
@@ -3217,7 +3225,7 @@ package LSP.Messages is
32173225
-- dynamicRegistration?: boolean;
32183226
--}
32193227
--```
3220-
subtype ReferenceClientCapabilities is dynamicRegistration;
3228+
subtype ReferenceClientCapabilities is Optional_dynamicRegistration;
32213229

32223230
--```typescript
32233231
--export interface DocumentHighlightClientCapabilities {
@@ -3227,7 +3235,7 @@ package LSP.Messages is
32273235
-- dynamicRegistration?: boolean;
32283236
--}
32293237
--```
3230-
subtype DocumentHighlightClientCapabilities is dynamicRegistration;
3238+
subtype DocumentHighlightClientCapabilities is Optional_dynamicRegistration;
32313239

32323240
--```typescript
32333241
--export interface CodeActionClientCapabilities {
@@ -3379,7 +3387,7 @@ package LSP.Messages is
33793387
-- dynamicRegistration?: boolean;
33803388
--}
33813389
--```
3382-
subtype CodeLensClientCapabilities is dynamicRegistration;
3390+
subtype CodeLensClientCapabilities is Optional_dynamicRegistration;
33833391

33843392
--```typescript
33853393
--export interface DocumentLinkClientCapabilities {
@@ -3426,7 +3434,7 @@ package LSP.Messages is
34263434
-- dynamicRegistration?: boolean;
34273435
--}
34283436
--```
3429-
subtype DocumentColorClientCapabilities is dynamicRegistration;
3437+
subtype DocumentColorClientCapabilities is Optional_dynamicRegistration;
34303438

34313439
--```typescript
34323440
--export interface DocumentFormattingClientCapabilities {
@@ -3436,7 +3444,7 @@ package LSP.Messages is
34363444
-- dynamicRegistration?: boolean;
34373445
--}
34383446
--```
3439-
subtype DocumentFormattingClientCapabilities is dynamicRegistration;
3447+
subtype DocumentFormattingClientCapabilities is Optional_dynamicRegistration;
34403448

34413449
--```typescript
34423450
--export interface DocumentRangeFormattingClientCapabilities {
@@ -3446,7 +3454,7 @@ package LSP.Messages is
34463454
-- dynamicRegistration?: boolean;
34473455
--}
34483456
--```
3449-
subtype DocumentRangeFormattingClientCapabilities is dynamicRegistration;
3457+
subtype DocumentRangeFormattingClientCapabilities is Optional_dynamicRegistration;
34503458

34513459
--```typescript
34523460
--export interface DocumentOnTypeFormattingClientCapabilities {
@@ -3456,7 +3464,7 @@ package LSP.Messages is
34563464
-- dynamicRegistration?: boolean;
34573465
--}
34583466
--```
3459-
subtype DocumentOnTypeFormattingClientCapabilities is dynamicRegistration;
3467+
subtype DocumentOnTypeFormattingClientCapabilities is Optional_dynamicRegistration;
34603468

34613469
--```typescript
34623470
--export namespace PrepareSupportDefaultBehavior {
@@ -3694,7 +3702,7 @@ package LSP.Messages is
36943702
-- dynamicRegistration?: boolean;
36953703
--}
36963704
--```
3697-
subtype SelectionRangeClientCapabilities is dynamicRegistration;
3705+
subtype SelectionRangeClientCapabilities is Optional_dynamicRegistration;
36983706

36993707
--```typescript
37003708
--export interface LinkedEditingRangeClientCapabilities {
@@ -3707,7 +3715,7 @@ package LSP.Messages is
37073715
-- dynamicRegistration?: boolean;
37083716
--}
37093717
--```
3710-
subtype LinkedEditingRangeClientCapabilities is dynamicRegistration;
3718+
subtype LinkedEditingRangeClientCapabilities is Optional_dynamicRegistration;
37113719

37123720
--```typescript
37133721
--interface CallHierarchyClientCapabilities {
@@ -3720,7 +3728,7 @@ package LSP.Messages is
37203728
-- dynamicRegistration?: boolean;
37213729
--}
37223730
--```
3723-
subtype CallHierarchyClientCapabilities is dynamicRegistration;
3731+
subtype CallHierarchyClientCapabilities is Optional_dynamicRegistration;
37243732

37253733
--```typescript
37263734
--export enum SemanticTokenTypes {
@@ -3993,7 +4001,7 @@ package LSP.Messages is
39934001
-- dynamicRegistration?: boolean;
39944002
--}
39954003
--```
3996-
subtype MonikerClientCapabilities is dynamicRegistration;
4004+
subtype MonikerClientCapabilities is Optional_dynamicRegistration;
39974005

39984006
--```typescript
39994007
--/**

‎testsuite/ada_lsp/U910-043.client_capabilities.optional/test.json‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
[
2+
{
3+
"comment": [
4+
"Verify that the server doesn't crash when receiving null and not {}",
5+
"for an optional client capability."
6+
]
7+
},
8+
{
9+
"start": {
10+
"cmd": [
11+
"${ALS}"
12+
]
13+
}
14+
},
15+
{
16+
"send": {
17+
"request": {
18+
"jsonrpc": "2.0",
19+
"id": 1,
20+
"method": "initialize",
21+
"params": {
22+
"processId": 40561,
23+
"rootUri": "$URI{.}",
24+
"capabilities": {
25+
"workspace": {
26+
"applyEdit": true,
27+
"workspaceEdit": {},
28+
"didChangeConfiguration": {},
29+
"didChangeWatchedFiles": {},
30+
"executeCommand": {}
31+
},
32+
"textDocument": {
33+
"synchronization": {},
34+
"completion": {
35+
"dynamicRegistration": true,
36+
"completionItem": {
37+
"snippetSupport": true,
38+
"documentationFormat": [
39+
"plaintext",
40+
"markdown"
41+
]
42+
}
43+
},
44+
"hover": {},
45+
"signatureHelp": {},
46+
"declaration": {},
47+
"definition": {},
48+
"typeDefinition": {},
49+
"implementation": {},
50+
"references": {},
51+
"documentHighlight": {},
52+
"documentSymbol": {
53+
"hierarchicalDocumentSymbolSupport": true
54+
},
55+
"codeLens": {},
56+
"colorProvider": {},
57+
"formatting": {
58+
"dynamicRegistration": false
59+
},
60+
"rangeFormatting": {
61+
"dynamicRegistration": false
62+
},
63+
"onTypeFormatting": {
64+
"dynamicRegistration": false
65+
},
66+
"foldingRange": {
67+
"lineFoldingOnly": true
68+
},
69+
"selectionRange": null,
70+
"linkedEditingRange": null,
71+
"callHierarchy": null,
72+
"moniker": null
73+
}
74+
}
75+
}
76+
},
77+
"wait": [
78+
{
79+
"id": 1,
80+
"result": {
81+
"capabilities": {
82+
"textDocumentSync": 2,
83+
"completionProvider": {
84+
"triggerCharacters": [
85+
".",
86+
"("
87+
],
88+
"resolveProvider": true
89+
},
90+
"hoverProvider": true,
91+
"signatureHelpProvider": {
92+
"triggerCharacters": [
93+
",",
94+
"("
95+
],
96+
"retriggerCharacters": [
97+
"\b"
98+
]
99+
},
100+
"declarationProvider": true,
101+
"definitionProvider": true,
102+
"typeDefinitionProvider": true,
103+
"implementationProvider": true,
104+
"referencesProvider": true,
105+
"documentHighlightProvider": true,
106+
"documentSymbolProvider": true,
107+
"codeActionProvider": {},
108+
"documentFormattingProvider": true,
109+
"renameProvider": {},
110+
"foldingRangeProvider": true,
111+
"executeCommandProvider": {
112+
"commands": [
113+
"als-other-file",
114+
"als-named-parameters",
115+
"als-refactor-imports",
116+
"als-refactor-remove-parameters",
117+
"als-refactor-move-parameter",
118+
"als-refactor-change-parameter-mode",
119+
"als-suppress-separate"
120+
]
121+
},
122+
"workspaceSymbolProvider": true,
123+
"callHierarchyProvider": {},
124+
"alsShowDepsProvider": true,
125+
"alsReferenceKinds": [
126+
"reference",
127+
"access",
128+
"write",
129+
"call",
130+
"dispatching call",
131+
"parent",
132+
"child"
133+
]
134+
}
135+
}
136+
}
137+
]
138+
}
139+
},
140+
{
141+
"send": {
142+
"request": {
143+
"jsonrpc": "2.0",
144+
"method": "initialized"
145+
},
146+
"wait": []
147+
}
148+
},
149+
{
150+
"send": {
151+
"request": {
152+
"jsonrpc": "2.0",
153+
"id": 16,
154+
"method": "shutdown"
155+
},
156+
"wait": [
157+
{
158+
"id": 16,
159+
"result": null
160+
}
161+
]
162+
}
163+
},
164+
{
165+
"stop": {
166+
"exit_code": 0
167+
}
168+
}
169+
]

‎testsuite/ada_lsp/U910-043.client_capabilities.optional/test.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
title: 'U910-043.client_capabilities.optional'

0 commit comments

Comments
 (0)