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

codetools: fixed reparsing initialization, finalization, begin

Browse Source 
git-svn-id: trunk@36972 -
This commit is contained in:
mattias 2012-04-22 17:51:21 +00:00
parent d9a785c090
commit ef54620381
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/codetools/pascalparsertool.pas
View File

@ -677,6 +677,8 @@ begin
case Node.Desc of
ctnInterface: ScannedRange:=lsrInterfaceStart;
ctnImplementation: ScannedRange:=lsrImplementationStart;
ctnInitialization: ScannedRange:=lsrInitializationStart;
ctnFinalization: ScannedRange:=lsrFinalizationStart;
end;
if ord(Range)<=ord(ScannedRange) then exit;
@ -4895,19 +4897,26 @@ begin
end else begin
// some nodes can be kept
// find first node to delete
DeleteNode:=Node.LastChild;
if DeleteNode<>nil then begin
while (DeleteNode.PriorBrother<>nil)
and (DeleteNode.StartPos>=DiffPos) do
DeleteNode:=DeleteNode.PriorBrother;
if (DeleteNode.Desc=ctnUsesSection)
and (DiffPos>=DeleteNode.StartPos+length('uses')) then begin
// keep uses section, just delete the used units nodes
DeleteNode.EndPos:=-1;
DeleteNode:=DeleteNode.Next;
end;
end else
DeleteNode:=Node.NextBrother;
if Node.Desc in [ctnInitialization,ctnFinalization,ctnBeginBlock]
then begin
// statement nodes are always parsed completely
DeleteNode:=Node;
Node:=Node.PriorBrother;
end else begin
DeleteNode:=Node.LastChild;
if DeleteNode<>nil then begin
while (DeleteNode.PriorBrother<>nil)
and (DeleteNode.StartPos>=DiffPos) do
DeleteNode:=DeleteNode.PriorBrother;
if (DeleteNode.Desc=ctnUsesSection)
and (DiffPos>=DeleteNode.StartPos+length('uses')) then begin
// keep uses section, just delete the used units nodes
DeleteNode.EndPos:=-1;
DeleteNode:=DeleteNode.Next;
end;
end else
DeleteNode:=Node.NextBrother;
end;
if DeleteNode<>nil then begin
{$IFDEF VerboseUpdateNeeded}
debugln(['TPascalParserTool.FetchScannerSource keep parts, last kept section=',Node.DescAsString,' FirstDeleteNode=',DeleteNode.DescAsString,' ',MainFilename]);