Skip to content

Commit 7b273a8

Browse files
committed
Pass request origin when extract documentation.
1 parent 7e3880d commit 7b273a8

File tree

6 files changed

+20
-6
lines changed

6 files changed

+20
-6
lines changed

source/ada/lsp-ada_completions-generic_assoc.adb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,7 @@ package body LSP.Ada_Completions.Generic_Assoc is
516516
begin
517517
LSP.Ada_Documentation.Get_Tooltip_Text
518518
(Name => Spec.Decl.P_Defining_Name,
519+
Origin => Libadalang.Analysis.No_Ada_Node,
519520
Style => Context.Get_Documentation_Style,
520521
Declaration_Text => Declaration_Text,
521522
Qualifier_Text => Qualifier_Text,

source/ada/lsp-ada_documentation.adb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ package body LSP.Ada_Documentation is
225225

226226
procedure Get_Tooltip_Text
227227
(Name : Libadalang.Analysis.Defining_Name;
228+
Origin : Libadalang.Analysis.Ada_Node'Class;
228229
Style : GNATdoc.Comments.Options.Documentation_Style;
229230
Declaration_Text : out VSS.Strings.Virtual_String;
230231
Qualifier_Text : out VSS.Strings.Virtual_String;
@@ -250,6 +251,7 @@ package body LSP.Ada_Documentation is
250251

251252
GNATdoc.Comments.Helpers.Get_Plain_Text_Documentation
252253
(Name => Name,
254+
Origin => Origin,
253255
Options => Options,
254256
Code_Snippet => Decl_Lines,
255257
Documentation => Doc_Lines);

source/ada/lsp-ada_documentation.ads

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ package LSP.Ada_Documentation is
2727

2828
procedure Get_Tooltip_Text
2929
(Name : Libadalang.Analysis.Defining_Name;
30+
Origin : Libadalang.Analysis.Ada_Node'Class;
3031
Style : GNATdoc.Comments.Options.Documentation_Style;
3132
Declaration_Text : out VSS.Strings.Virtual_String;
3233
Qualifier_Text : out VSS.Strings.Virtual_String;

source/ada/lsp-ada_documents.adb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,6 +1385,7 @@ package body LSP.Ada_Documents is
13851385
begin
13861386
LSP.Ada_Documentation.Get_Tooltip_Text
13871387
(Name => Name,
1388+
Origin => Libadalang.Analysis.No_Ada_Node,
13881389
Style => Context.Get_Documentation_Style,
13891390
Declaration_Text => Decl_Text,
13901391
Qualifier_Text => Qual_Text,

source/ada/lsp-ada_handlers.adb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,6 +1986,7 @@ package body LSP.Ada_Handlers is
19861986
begin
19871987
LSP.Ada_Documentation.Get_Tooltip_Text
19881988
(Name => Node.As_Defining_Name,
1989+
Origin => Libadalang.Analysis.No_Ada_Node,
19891990
Style => Self.Configuration.Documentation_Style,
19901991
Qualifier_Text => Qual_Text,
19911992
Location_Text => Loc_Text,

source/ada/lsp-ada_hover.adb

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,9 @@ package body LSP.Ada_Hover is
8787
-- For the Hover request, we're only interested in the "best"
8888
-- response value, not in the list of values for all contexts
8989

90-
Defining_Name_Node : constant Libadalang.Analysis.Defining_Name :=
91-
Self.Parent.Context.Imprecise_Resolve_Name (Context.all, Value);
92-
Decl : constant Libadalang.Analysis.Basic_Decl :=
93-
(if Defining_Name_Node.Is_Null
94-
then Libadalang.Analysis.No_Basic_Decl
95-
else Defining_Name_Node.P_Basic_Decl);
90+
Defining_Name_Node : Libadalang.Analysis.Defining_Name;
91+
Origin_Node : Libadalang.Analysis.Ada_Node;
92+
Decl : Libadalang.Analysis.Basic_Decl;
9693
-- Associated basic declaration, if any
9794

9895
Decl_Text : VSS.Strings.Virtual_String;
@@ -104,6 +101,16 @@ package body LSP.Ada_Hover is
104101
begin
105102
Status := LSP.Server_Jobs.Done;
106103

104+
Self.Parent.Context.Imprecise_Resolve_Name
105+
(Context.all,
106+
Value,
107+
Defining_Name_Node,
108+
Origin_Node);
109+
Decl :=
110+
(if Defining_Name_Node.Is_Null
111+
then Libadalang.Analysis.No_Basic_Decl
112+
else Defining_Name_Node.P_Basic_Decl);
113+
107114
if Decl.Is_Null then
108115

109116
-- There is no declaration for the hovered node: ask the predefined
@@ -127,6 +134,7 @@ package body LSP.Ada_Hover is
127134
-- the default tooltip provider, based on GNATdoc.
128135
LSP.Ada_Documentation.Get_Tooltip_Text
129136
(Name => Defining_Name_Node,
137+
Origin => Origin_Node,
130138
Style => Context.Get_Documentation_Style,
131139
Declaration_Text => Decl_Text,
132140
Qualifier_Text => Qualifier_Text,

0 commit comments

Comments
 (0)