paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-14 10:39:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: fixed compile

Browse Source
This commit is contained in:
mattias 2025-01-02 10:40:58 +01:00
parent ae48e9841e
commit 8ec63ba013
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/findrenameidentifier.pas
View File

@ -450,13 +450,14 @@ begin
OldChange:=LazarusIDE.OpenEditorsOnCodeToolChange;
LazarusIDE.OpenEditorsOnCodeToolChange:=true;
try
isConflicted:=false; // todo: check for conflicts and show user list
if not CodeToolBoss.RenameIdentifier(PascalReferences,
Identifier, Options.RenameTo, DeclCode, @DeclarationCaretXY, isConflicted)
Identifier, Options.RenameTo, DeclCode, @DeclarationCaretXY)
then begin
if isConflicted then
IDEMessageDialog(lisRenamingConflict,
Format(lisIdentifierWasAlreadyUsed,[Options.RenameTo]),
mtError,[mbOK])
IDEMessageDialog(lisRenamingConflict,
Format(lisIdentifierWasAlreadyUsed,[Options.RenameTo]),
mtError,[mbOK])
else
LazarusIDE.DoJumpToCodeToolBossError;
debugln('Error: (lazarus) DoFindRenameIdentifier unable to commit');

4
ide/sourcefilemanager.pas
View File

@ -8563,7 +8563,7 @@ var
PascalReferences: TAVLTree;
i: Integer;
MsgResult: TModalResult;
OnlyEditorFiles, isConflicted: Boolean;
OnlyEditorFiles: Boolean;
aFilename: String;
begin
// compare unitnames case sensitive, maybe only the case changed
@ -8653,7 +8653,7 @@ begin
end;
end;
if not CodeToolBoss.RenameIdentifier(PascalReferences,OldUnitName,NewUnitName,
Nil,Nil,isConflicted) then
Nil,Nil) then
begin
if (not IgnoreErrors) and (not Quiet) then
MainIDE.DoJumpToCodeToolBossError;