Skip to content

Commit 3c3fc89

Browse files
Merge branch 'topic/eng/ide/ada_language_server#1280' into 'edge'
Use case-sensitive search when renaming comments See merge request eng/ide/ada_language_server!1480
2 parents 3f297ca + d592999 commit 3c3fc89

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

source/ada/lsp-ada_handlers-renaming.adb

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
------------------------------------------------------------------------------
1717

1818
with Ada.Strings.Unbounded;
19-
with Ada.Strings.Wide_Wide_Unbounded;
2019

2120
with Langkit_Support.Slocs;
2221
with Langkit_Support.Text;
@@ -188,10 +187,7 @@ package body LSP.Ada_Handlers.Renaming is
188187

189188
Set : LAL_Refactor.Text_Edit_Ordered_Set;
190189
Token : Token_Reference := Unit.First_Token;
191-
-- Name : constant Wide_Wide_String := Name_Node.Text;
192-
Name : constant Wide_Wide_String :=
193-
Ada.Strings.Wide_Wide_Unbounded.To_Wide_Wide_String
194-
(Laltools.Common.Get_Last_Name (Name_Node));
190+
Name : constant Wide_Wide_String := Name_Node.Text;
195191
Text_Edit : LAL_Refactor.Text_Edit;
196192
Span : Langkit_Support.Slocs.Source_Location_Range;
197193
Current : Token_Reference;
@@ -279,7 +275,11 @@ package body LSP.Ada_Handlers.Renaming is
279275
begin
280276
if Kind (Data (Token)) = Ada_Comment
281277
and then Laltools.Common.Contains
282-
(Token, Name, True, This_Span)
278+
(Token => Token,
279+
Pattern => Name,
280+
As_Word => True,
281+
Span => This_Span,
282+
Case_Sensitive => True)
283283
then
284284
Text_Edit.Location := This_Span;
285285
Text_Edit.Text :=
@@ -290,7 +290,11 @@ package body LSP.Ada_Handlers.Renaming is
290290

291291
if Diff /= 0
292292
and then Laltools.Common.Contains
293-
(Token, "-- " & Name & " --", False, Span)
293+
(Token => Token,
294+
Pattern => "-- " & Name & " --",
295+
As_Word => False,
296+
Span => Span,
297+
Case_Sensitive => True)
294298
then
295299
-- Can be a comment box
296300
Current := Previous (Token);

0 commit comments

Comments
 (0)