Skip to content

Commit 4bfd8c7

Browse files
Merge branch 'topic/U614-031.aggregate.formatting' into 'master'
U614-031: Fix formatting for simple aggregate See merge request eng/ide/ada_language_server!1212
2 parents ffb8e41 + 6d1b4b7 commit 4bfd8c7

File tree

6 files changed

+457
-2
lines changed

6 files changed

+457
-2
lines changed

source/ada/lsp-ada_completions-parameters.adb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,8 +713,15 @@ package body LSP.Ada_Completions.Parameters is
713713
Column : out Langkit_Support.Slocs.Column_Number)
714714
return Libadalang.Analysis.Ada_Node'Class is
715715
begin
716-
Column := A.Parent.Sloc_Range.Start_Column;
717-
return A.Parent;
716+
if A.Parent.Kind in Ada_Qual_Expr_Range then
717+
-- we have: My_Type'(
718+
Column := A.Parent.Sloc_Range.Start_Column;
719+
return A.Parent;
720+
else
721+
-- not prefixed by a type
722+
Column := A.Sloc_Range.Start_Column;
723+
return A;
724+
end if;
718725
end Get_Prefix_Node;
719726

720727
----------------
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
project Default is
2+
3+
for Source_Dirs use ("src");
4+
for Main use ("foo.adb");
5+
6+
end Default;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
procedure Foo is
2+
type My_Record is tagged record
3+
I, J : Integer;
4+
F : Float;
5+
end record;
6+
7+
Bar : My_Record := My_Record'(
8+
begin
9+
null;
10+
end Foo;

0 commit comments

Comments
 (0)