Skip to content

Commit a86021b

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents 774a98c + 1d96b44 commit a86021b

File tree

23 files changed

+566
-717
lines changed

23 files changed

+566
-717
lines changed

.github/workflows/build-binaries.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ fi
1818
export GPR_PROJECT_PATH=$prefix/share/gpr:\
1919
$PWD/subprojects/VSS/gnat:\
2020
$PWD/subprojects/gnatdoc/gnat:\
21+
$PWD/subprojects/lal-refactor/gnat:\
2122
$PWD/subprojects/libadalang-tools/src:\
2223
$PWD/subprojects/spawn/gnat:\
2324
$PWD/subprojects/stubs

.github/workflows/build-binaries.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
- edge
55
tags:
66
- 2*.*.*
7-
pull_request:
87
name: Build binaries
98
env:
109
DEFAULT_TAG: 23.0.999
@@ -71,6 +70,12 @@ jobs:
7170
repository: AdaCore/gnatdoc
7271
path: subprojects/gnatdoc
7372
ref: edge
73+
- name: Get LAL Refactor
74+
uses: actions/checkout@v3
75+
with:
76+
repository: AdaCore/lal-refactor
77+
path: subprojects/lal-refactor
78+
ref: edge
7479
- uses: actions/cache@v3
7580
with:
7681
path: ./cached_gnat

integration/vscode/ada/package-lock.json

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/ada/lsp-ada_completions-generic_assoc.adb

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
-- Language Server Protocol --
33
-- --
4-
-- Copyright (C) 2022, AdaCore --
4+
-- Copyright (C) 2022-2023, AdaCore --
55
-- --
66
-- This is free software; you can redistribute it and/or modify it under --
77
-- terms of the GNU General Public License as published by the Free Soft- --
@@ -18,9 +18,8 @@
1818
with GNATCOLL.Utils;
1919
with GNATCOLL.Traces;
2020
with Laltools.Common;
21-
with Libadalang.Doc_Utils;
2221
with LSP.Ada_Documents;
23-
with LSP.Common;
22+
with LSP.Ada_Documentation;
2423
with LSP.Lal_Utils;
2524
with LSP.Types;
2625
with VSS.Strings.Character_Iterators;
@@ -497,15 +496,7 @@ package body LSP.Ada_Completions.Generic_Assoc is
497496

498497
procedure Add_Signature (Spec : Assoc_Data) is
499498
Signature : LSP.Messages.SignatureInformation :=
500-
(label => LSP.Common.Get_Hover_Text (Spec.Decl),
501-
documentation =>
502-
(Is_Set => True,
503-
Value =>
504-
(Is_String => True,
505-
String =>
506-
VSS.Strings.To_Virtual_String
507-
(Libadalang.Doc_Utils.Get_Documentation
508-
(Spec.Decl).Doc.To_String))),
499+
(label => <>,
509500
activeParameter =>
510501
(Is_Set => True,
511502
Value =>
@@ -515,7 +506,27 @@ package body LSP.Ada_Completions.Generic_Assoc is
515506
Cursor_Position => Cursor_Position)),
516507
others => <>
517508
);
509+
Declaration_Text : VSS.Strings.Virtual_String;
510+
Qualifier_Text : VSS.Strings.Virtual_String;
511+
Location_Text : VSS.Strings.Virtual_String;
512+
Documentation_Text : VSS.Strings.Virtual_String;
513+
Aspects_Text : VSS.Strings.Virtual_String;
514+
518515
begin
516+
LSP.Ada_Documentation.Get_Tooltip_Text
517+
(BD => Spec.Decl,
518+
Style => Context.Get_Documentation_Style,
519+
Declaration_Text => Declaration_Text,
520+
Qualifier_Text => Qualifier_Text,
521+
Location_Text => Location_Text,
522+
Documentation_Text => Documentation_Text,
523+
Aspects_Text => Aspects_Text);
524+
525+
Signature.label := Declaration_Text;
526+
Signature.documentation :=
527+
(Is_Set => True,
528+
Value => (Is_String => True, String => Documentation_Text));
529+
519530
for Param of Spec.Param_Vector loop
520531
declare
521532
P : constant LSP.Messages.ParameterInformation :=

0 commit comments

Comments
 (0)