paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-28 03:40:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fixed FindLineEndOrCodeInFrontOfPosition for nested directives, bug #18616

Browse Source 
git-svn-id: trunk@29218 -
This commit is contained in:
mattias 2011-01-27 18:41:52 +00:00
parent 15e4d2cce8
commit f9121611a1
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/codetools/basiccodetools.pas
View File

@ -2531,23 +2531,26 @@ function FindLineEndOrCodeInFrontOfPosition(const Source: string;
}
var SrcStart: integer;
function ReadComment(var P: integer): boolean;
// false if compiler directive
function ReadComment(var P: integer; SubComment: boolean): boolean;
// true if comment was skipped
// false if not skipped, because comment is compiler directive
var OldP: integer;
IsDirective: Boolean;
begin
debugln(['ReadComment ',dbgstr(copy(Source,p-5,5))+'|'+Source[P]+dbgstr(copy(Source,p+1,5))]);
OldP:=P;
IsDirective:=false;
case Source[P] of
'}':
begin
dec(P);
while (P>=SrcStart) and (Source[P]<>'{') do begin
if NestedComments and (Source[P]='}') then
ReadComment(P)
ReadComment(P,true)
else
dec(P);
end;
Result:=not (StopAtDirectives
and (P>=SrcStart) and (Source[P+1]='$'));
IsDirective:=(P>=SrcStart) and (Source[P+1]='$');
dec(P);
end;
')':
@ -2558,12 +2561,11 @@ var SrcStart: integer;
while (P>SrcStart)
and ((Source[P-1]<>'(') or (Source[P]<>'*')) do begin
if NestedComments and ((Source[P]=')') and (Source[P-1]='*')) then
ReadComment(P)
ReadComment(P,true)
else
dec(P);
end;
Result:=not (StopAtDirectives
and (P>=SrcStart) and (Source[P+1]='$'));
IsDirective:=(P>=SrcStart) and (Source[P+1]='$');
dec(P,2);
end else begin
// normal bracket
@ -2573,8 +2575,9 @@ var SrcStart: integer;
end;
end;
else
Result:=true;
exit(true);
end;
Result:=(not IsDirective) or (not StopAtDirectives) or SubComment;
if not Result then P:=OldP+1;
end;
@ -2597,7 +2600,7 @@ begin
while (Result>=SrcStart) do begin
case Source[Result] of
'}',')':
if not ReadComment(Result) then exit;
if not ReadComment(Result,false) then exit;
#10,#13:
begin