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

IDE, Code Templates: Limit allowed template name characters by latin symbols, numbers and undersore. Patch by n7800, issue #40654

Browse Source
This commit is contained in:
Maxim Ganetsky 2024-01-03 18:05:15 +03:00
parent bd1a394e9f
commit 6c9360aec5
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ide/codetemplatesdlg.pas
View File

@ -214,21 +214,42 @@ begin
end; end;
function IsCodeTemplateOk(ASynAutoComplete: TSynEditAutoComplete; function IsCodeTemplateOk(ASynAutoComplete: TSynEditAutoComplete;
const AToken: string; AIndex: integer): boolean; const AToken: string; ASkipExistCheck: boolean = false): boolean;
var var
n: integer; i: integer;
begin begin
n:=ASynAutoComplete.Completions.IndexOf(AToken); result := true;
if (n<0) or (n=AIndex) then
Result:= true // empty
else if AToken = '' then
begin begin
Result:= false; IDEMessageDialog(lisCodeTemplError, lisCodeTemplErrorEmptyName, mtError, [mbOK]);
IDEMessageDialog( exit(false);
lisCodeTemplError,
Format(lisCodeTemplATokenAlreadyExists, [AToken]),
mtError, [mbOK]);
end; end;
// exists
if not ASkipExistCheck then
if ASynAutoComplete.Completions.IndexOf(AToken) >= 0 then
begin
IDEMessageDialog(lisCodeTemplError, lisCodeTemplErrorAlreadyExists, mtError, [mbOK]);
exit(false);
end;
// first symbol
if AToken[1] in ['0'..'9'] then
result := false;
// all symbols
i := 1;
while (i <= length(AToken)) and (result = true) do
begin
if not (AToken[i] in ['0'..'9', 'A'..'Z', 'a'..'z', '_']) then
result := false;
inc(i);
end;
if result = false then
IDEMessageDialog(lisCodeTemplError, lisCodeTemplErrorInvalidName, mtError, [mbOK]);
end; end;
function AddCodeTemplate(ASynAutoComplete: TSynEditAutoComplete; function AddCodeTemplate(ASynAutoComplete: TSynEditAutoComplete;
@ -244,7 +265,7 @@ begin
if InputQuery(lisCodeTemplAddCodeTemplate, if InputQuery(lisCodeTemplAddCodeTemplate,
[lisCodeTemplToken, lisCodeTemplComment], Str) then [lisCodeTemplToken, lisCodeTemplComment], Str) then
if IsCodeTemplateOk(ASynAutoComplete, Str[0], ASynAutoComplete.Completions.Count) then if IsCodeTemplateOk(ASynAutoComplete, Str[0]) then
begin begin
Result:= mrOk; Result:= mrOk;
AToken:= Str[0]; AToken:= Str[0];
@ -267,7 +288,7 @@ begin
if not InputQuery(lisCodeTemplEditCodeTemplate, if not InputQuery(lisCodeTemplEditCodeTemplate,
[lisCodeTemplToken, lisCodeTemplComment], Str) then exit; [lisCodeTemplToken, lisCodeTemplComment], Str) then exit;
if not IsCodeTemplateOk(ASynAutoComplete, Str[0], AIndex) then exit; if not IsCodeTemplateOk(ASynAutoComplete, Str[0], true) then exit;
ASynAutoComplete.Completions[AIndex]:= Str[0]; ASynAutoComplete.Completions[AIndex]:= Str[0];
ASynAutoComplete.CompletionComments[AIndex]:= Str[1]; ASynAutoComplete.CompletionComments[AIndex]:= Str[1];

4
ide/lazarusidestrconsts.pas
View File

@ -3790,7 +3790,9 @@ resourcestring
lisCodeTemplAutoCompleteOn = 'Auto complete on'; lisCodeTemplAutoCompleteOn = 'Auto complete on';
lisCodeTemplToken = 'Token:'; lisCodeTemplToken = 'Token:';
lisCodeTemplComment = 'Comment:'; lisCodeTemplComment = 'Comment:';
lisCodeTemplATokenAlreadyExists = ' A token "%s" already exists! '; lisCodeTemplErrorAlreadyExists = 'A token already exists.';
lisCodeTemplErrorInvalidName = 'The token can only contain Latin letters, numbers and underscores, and cannot begin with a number.';
lisCodeTemplErrorEmptyName = 'The token cannot be empty.';
lisCodeTemplError = 'Error'; lisCodeTemplError = 'Error';
lisUnableToFindTheComponentClassItIsNotRegisteredViaR = 'Unable to find the component class "%s".' lisUnableToFindTheComponentClassItIsNotRegisteredViaR = 'Unable to find the component class "%s".'
+'%sIt is not registered via RegisterClass and no lfm was found.' +'%sIt is not registered via RegisterClass and no lfm was found.'