Skip to content

Commit 63e1682

Browse files
reznikmmreznikmm
committed
Merge branch 'topic/fix_lsp_gen' into 'master'
Update LSP generator after splitting VSS library. Closes #1744 See merge request eng/ide/ada_language_server!2312
2 parents 57d2528 + 889621d commit 63e1682

9 files changed

Lines changed: 395 additions & 273 deletions

File tree

‎gnat/lsp_gen.gpr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
with "vss_text";
1919
with "vss_json";
20+
with "vss_os";
2021

2122
project LSP_Gen is
2223

‎liblsp_3_17/source/generated/lsp-inputs-part_17.adb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ package body LSP.Inputs.Part_17 is
4949
"documentation",
5050
"defaultLibrary",
5151
"globalVariable",
52-
"localVariable"]);
52+
"localVariable",
53+
"dispatchingCall"]);
5354

5455
procedure Read_SemanticTokenModifiers
5556
(Handler : in out VSS.JSON.Pull_Readers.JSON_Pull_Reader'Class;

‎liblsp_3_17/source/generated/lsp-inputs-part_20.adb‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package body LSP.Inputs.Part_20 is
2121
(["uri",
2222
"range",
2323
"alsKind",
24+
"hidden",
2425
"originSelectionRange",
2526
"targetUri",
2627
"targetRange",
@@ -71,22 +72,27 @@ package body LSP.Inputs.Part_20 is
7172
(Kind => LSP.Structures.Variant_1,
7273
others => <>);
7374
exit;
74-
when 4 => -- originSelectionRange
75+
when 4 => -- hidden
76+
Value :=
77+
(Kind => LSP.Structures.Variant_1,
78+
others => <>);
79+
exit;
80+
when 5 => -- originSelectionRange
7581
Value :=
7682
(Kind => LSP.Structures.Variant_2,
7783
others => <>);
7884
exit;
79-
when 5 => -- targetUri
85+
when 6 => -- targetUri
8086
Value :=
8187
(Kind => LSP.Structures.Variant_2,
8288
others => <>);
8389
exit;
84-
when 6 => -- targetRange
90+
when 7 => -- targetRange
8591
Value :=
8692
(Kind => LSP.Structures.Variant_2,
8793
others => <>);
8894
exit;
89-
when 7 => -- targetSelectionRange
95+
when 8 => -- targetSelectionRange
9096
Value :=
9197
(Kind => LSP.Structures.Variant_2,
9298
others => <>);

‎liblsp_3_17/source/generated/lsp-inputs-part_23.adb‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ package body LSP.Inputs.Part_23 is
129129
(["uri",
130130
"range",
131131
"alsKind",
132+
"hidden",
132133
"originSelectionRange",
133134
"targetUri",
134135
"targetRange",
@@ -179,22 +180,27 @@ package body LSP.Inputs.Part_23 is
179180
(Kind => LSP.Structures.Variant_1,
180181
others => <>);
181182
exit;
182-
when 4 => -- originSelectionRange
183+
when 4 => -- hidden
184+
Value :=
185+
(Kind => LSP.Structures.Variant_1,
186+
others => <>);
187+
exit;
188+
when 5 => -- originSelectionRange
183189
Value :=
184190
(Kind => LSP.Structures.Variant_2,
185191
others => <>);
186192
exit;
187-
when 5 => -- targetUri
193+
when 6 => -- targetUri
188194
Value :=
189195
(Kind => LSP.Structures.Variant_2,
190196
others => <>);
191197
exit;
192-
when 6 => -- targetRange
198+
when 7 => -- targetRange
193199
Value :=
194200
(Kind => LSP.Structures.Variant_2,
195201
others => <>);
196202
exit;
197-
when 7 => -- targetSelectionRange
203+
when 8 => -- targetSelectionRange
198204
Value :=
199205
(Kind => LSP.Structures.Variant_2,
200206
others => <>);
@@ -849,7 +855,8 @@ package body LSP.Inputs.Part_23 is
849855
package Definition_Result_Map is new Minimal_Perfect_Hash
850856
(["uri",
851857
"range",
852-
"alsKind"]);
858+
"alsKind",
859+
"hidden"]);
853860

854861
end Definition_Result_Scope;
855862

@@ -900,6 +907,11 @@ package body LSP.Inputs.Part_23 is
900907
(Kind => LSP.Structures.Variant_1,
901908
others => <>);
902909
exit;
910+
when 4 => -- hidden
911+
Value :=
912+
(Kind => LSP.Structures.Variant_1,
913+
others => <>);
914+
exit;
903915
when others =>
904916
Handler.Skip_Current_Value;
905917
end case;

‎liblsp_3_17/source/generated/lsp-inputs-part_4.adb‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ package body LSP.Inputs.Part_4 is
2020
package Declaration_Result_Map is new Minimal_Perfect_Hash
2121
(["uri",
2222
"range",
23-
"alsKind"]);
23+
"alsKind",
24+
"hidden"]);
2425

2526
end Declaration_Result_Scope;
2627

@@ -71,6 +72,11 @@ package body LSP.Inputs.Part_4 is
7172
(Kind => LSP.Structures.Variant_1,
7273
others => <>);
7374
exit;
75+
when 4 => -- hidden
76+
Value :=
77+
(Kind => LSP.Structures.Variant_1,
78+
others => <>);
79+
exit;
7480
when others =>
7581
Handler.Skip_Current_Value;
7682
end case;

‎liblsp_3_17/source/generated/lsp-inputs-part_7.adb‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2196,6 +2196,7 @@ package body LSP.Inputs.Part_7 is
21962196
package Location_Or_Something_Map is new Minimal_Perfect_Hash
21972197
(["range",
21982198
"alsKind",
2199+
"hidden",
21992200
"uri"]);
22002201

22012202
end Location_Or_Something_Scope;
@@ -2249,6 +2250,11 @@ package body LSP.Inputs.Part_7 is
22492250
(Is_Location => True,
22502251
others => <>);
22512252
exit;
2253+
when 3 => -- hidden
2254+
Value :=
2255+
(Is_Location => True,
2256+
others => <>);
2257+
exit;
22522258
when others =>
22532259
Handler.Skip_Current_Value;
22542260
end case;
@@ -2275,7 +2281,7 @@ package body LSP.Inputs.Part_7 is
22752281
begin
22762282
Handler.Read_Next;
22772283
case Location_Or_Something_Map.Get_Index (Key) is
2278-
when 3 => -- uri
2284+
when 4 => -- uri
22792285
Value.uri :=
22802286
(Handler.String_Value with null record);
22812287
Handler.Read_Next;

‎liblsp_3_17/source/generated/lsp-inputs-part_9.adb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,8 @@ package body LSP.Inputs.Part_9 is
577577
package Location_Map is new Minimal_Perfect_Hash
578578
(["uri",
579579
"range",
580-
"alsKind"]);
580+
"alsKind",
581+
"hidden"]);
581582

582583
end Location_Scope;
583584

@@ -604,7 +605,7 @@ package body LSP.Inputs.Part_9 is
604605
when 3 => -- alsKind
605606
Read_AlsReferenceKind_Set (Handler, Value.alsKind);
606607
when 4 => -- hidden
607-
Value.hidden :=
608+
Value.hidden :=
608609
(Is_Set => True,
609610
Value => <>);
610611
Value.hidden.Value := Handler.Boolean_Value;

‎liblsp_3_17/source/generated/lsp-structures.ads‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3009,6 +3009,8 @@ package LSP.Structures is
30093009
alsKind : LSP.Structures.AlsReferenceKind_Set;
30103010

30113011
hidden : Boolean_Optional;
3012+
-- Set to True if the location is from the hidden source file (extended
3013+
-- project)
30123014

30133015
end record;
30143016
-- Represents a location inside a resource, such as a line inside a text

0 commit comments

Comments
 (0)