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

codetools: fixed FindStartOFindStartOfAtomfAtom if at start of string constant

Browse Source 
git-svn-id: trunk@27688 -
This commit is contained in:
mattias 2010-10-13 22:11:06 +00:00
parent ce82f81416
commit ef525bda22
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/codetools/basiccodetools.pas
View File

@ -2076,7 +2076,9 @@ function FindStartOfAtom(const Source: string; Position: integer): integer;
procedure ReadStringConstantBackward(var p: integer); procedure ReadStringConstantBackward(var p: integer);
var var
PrePos: integer; PrePos: integer;
StartPos: LongInt;
begin begin
StartPos:=p;
while (p>1) do begin while (p>1) do begin
case Source[p-1] of case Source[p-1] of
'''': '''':
@ -2086,6 +2088,8 @@ function FindStartOfAtom(const Source: string; Position: integer): integer;
repeat repeat
dec(PrePos); dec(PrePos);
if (PrePos<1) or (Source[PrePos] in [#10,#13]) then begin if (PrePos<1) or (Source[PrePos] in [#10,#13]) then begin
// the StartPos was the start of a string constant
p:=StartPos-1;
exit; exit;
end; end;
until (Source[PrePos]=''''); until (Source[PrePos]='''');
@ -2158,6 +2162,7 @@ begin
end; end;
'''': '''':
begin begin
// could be start or end
inc(Result); inc(Result);
ReadStringConstantBackward(Result); ReadStringConstantBackward(Result);
end; end;

1
components/codetools/finddeclarationtool.pas
View File

@ -8127,6 +8127,7 @@ function TFindDeclarationTool.GetCurrentAtomType: TVariableAtomType;
var var
Node: TCodeTreeNode; Node: TCodeTreeNode;
begin begin
//debugln(['TFindDeclarationTool.GetCurrentAtomType ',CurPos.StartPos,' ',CurPos.EndPos,' ',SrcLen,' ',GetAtom]);
if (CurPos.StartPos=CurPos.EndPos) then if (CurPos.StartPos=CurPos.EndPos) then
Result:=vatSpace Result:=vatSpace
else if (CurPos.StartPos>SrcLen) then else if (CurPos.StartPos>SrcLen) then