Skip to content

Commit 36f1ce4

Browse files
committed
Merge remote-tracking branch 'origin/master' into edge
2 parents 011fee7 + 37bb74d commit 36f1ce4

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

source/ada/lsp-ada_handlers.adb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3305,8 +3305,10 @@ package body LSP.Ada_Handlers is
33053305
Location_Text := LSP.Lal_Utils.Node_Location_Image (Decl);
33063306

33073307
if Self.Project_Tree.Root_Project.Kind in GPR2.Aggregate_Kind then
3308-
Location_Text.Append (" in project ");
3308+
Location_Text.Append (VSS.Characters.Latin.Line_Feed);
3309+
Location_Text.Append ("As defined in project ");
33093310
Location_Text.Append (C.Id);
3311+
Location_Text.Append (" (other projects skipped).");
33103312
end if;
33113313

33123314
Response.result.Value.contents.Vector.Append

testsuite/ada_lsp/implementation.aggregates/test.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
"value": "function Common_Fun return Integer",
240240
"language": "ada"
241241
},
242-
"at common_pack.ads (4:4) in project p"
242+
"at common_pack.ads (4:4)\nAs defined in project p (other projects skipped)."
243243
]
244244
}
245245
}
@@ -271,7 +271,7 @@
271271
"value": "function Common_Fun return Integer",
272272
"language": "ada"
273273
},
274-
"at common_pack.ads (4:4) in project p"
274+
"at common_pack.ads (4:4)\nAs defined in project p (other projects skipped)."
275275
]
276276
}
277277
}

0 commit comments

Comments
 (0)