mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-13 16:49:07 +02:00
IDE: EditorMacros, fix generating error msg (avoid index out of range error). Fix type in test for whitespace. Issue #0036082
git-svn-id: trunk@61898 -
This commit is contained in:
parent
76d23f638b
commit
ad89fb55f9
@ -792,8 +792,14 @@ var
|
|||||||
begin
|
begin
|
||||||
f := TStringList.Create;
|
f := TStringList.Create;
|
||||||
f.Text := copy(FOrigText,1 ,FPos);
|
f.Text := copy(FOrigText,1 ,FPos);
|
||||||
Result.y := f.Count;
|
if f.Count = 0 then begin
|
||||||
Result.x := length(f[f.Count-1])+1;
|
Result.y := 1;
|
||||||
|
Result.x := 1;
|
||||||
|
end
|
||||||
|
else begin
|
||||||
|
Result.y := f.Count;
|
||||||
|
Result.x := length(f[f.Count-1])+1;
|
||||||
|
end;
|
||||||
f.Free;
|
f.Free;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -848,11 +854,13 @@ end;
|
|||||||
function TIdeMacroEventReader.ParseNextEvent: Boolean;
|
function TIdeMacroEventReader.ParseNextEvent: Boolean;
|
||||||
procedure SkipNum(var i: integer);
|
procedure SkipNum(var i: integer);
|
||||||
begin
|
begin
|
||||||
while (i <= Length(FText)) and (FText[i] in ['0'..'9']) do inc (i);
|
while (i <= Length(FText)) and (FText[i] in ['0'..'9']) do
|
||||||
|
inc(i);
|
||||||
end;
|
end;
|
||||||
procedure SkipSpace(var i: integer);
|
procedure SkipSpace(var i: integer);
|
||||||
begin
|
begin
|
||||||
while (i <= Length(FText)) and (FText[i] in [' '..#9, #13, #10]) do inc (i);
|
while (i <= Length(FText)) and (FText[i] in [' ', #9, #13, #10]) do
|
||||||
|
inc(i);
|
||||||
end;
|
end;
|
||||||
var
|
var
|
||||||
c,i,j,k: Integer;
|
c,i,j,k: Integer;
|
||||||
|
Loading…
Reference in New Issue
Block a user