paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 11:18:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: find/rename identifier: fixed error hint on keywords

Browse Source
This commit is contained in:
mattias 2025-02-12 16:46:09 +01:00
parent 4c647e3963
commit 73db35fc82
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/customcodetool.pas
View File

@ -2403,7 +2403,7 @@ end;
function TCustomCodeTool.StringIsKeyWord(const Word: string): boolean;
begin
Result:=(Word<>'') and IsIdentStartChar[Word[1]]
and WordIsKeyWordFuncList.DoItUpperCase(Word,1,length(Word));
and WordIsKeyWordFuncList.DoItCaseInsensitive(Word);
end;
procedure TCustomCodeTool.MoveCursorToNodeStart(ANode: TCodeTreeNode);

13
ide/findrenameidentifier.pas
View File

@ -1064,17 +1064,18 @@ begin
if IsNodeInvalid('TFindRenameIdentifierDialog.ValidateNewName') then exit;
Err:='';
FNewIdentifier:=NewEdit.Text;
if (FNode<>nil)
and (FNode.Desc in [ctnProgram..ctnUnit,ctnUseUnitNamespace,ctnUseUnitClearName]) then
ok:=IsValidDottedIdent(FNewIdentifier) //can be dotted
else
ok:=IsValidDottedIdent(FNewIdentifier,false);//not dotted for sure
ok:=IsValidDottedIdent(FNewIdentifier);
if not ok then begin
if FNewIdentifier='' then
Err:=lisIdentifierCannotBeEmpty
else
Err:= format(lisIdentifierIsInvalid,[FNewIdentifier]);
end else if not (FNode.Desc in [ctnProgram..ctnUnit,ctnUseUnit,
ctnUseUnitNamespace,ctnUseUnitClearName])
and (Pos('.',FNewIdentifier)>0) then
begin
ok:=false;
Err:=Format(lisIdentifierCannotBeDotted,[FNewIdentifier]);
end;
if ok and (FTool<>nil) then begin