paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-16 12:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: not reparsing when cursor in valid interface

Browse Source 
git-svn-id: trunk@15064 -
This commit is contained in:
mattias 2008-05-06 19:19:40 +00:00
parent 2b9cb9182b
commit 5122d3eaaf
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/finddeclarationtool.pas
View File

@ -3385,7 +3385,7 @@ begin
ActivateGlobalWriteLock;
try
BuildTreeAndGetCleanPos(trAll,CursorPos,CleanPos,[]);
BuildTreeAndGetCleanPos(trTillCursorSection,CursorPos,CleanPos,[]);
NodeList:=TFPList.Create;
NewTool:=Self;

38
components/codetools/pascalparsertool.pas
View File

@ -90,7 +90,7 @@ type
TProcHeadExtractPos = (phepNone, phepStart, phepName, phepParamList,
phepResultType, phepSpecifiers);
TTreeRange = (trInterface, trAll, trTillCursor);
TTreeRange = (trInterface, trAll, trTillCursor, trTillCursorSection);
TBuildTreeFlag = (
btSetIgnoreErrorPos,
@ -210,7 +210,6 @@ type
InterfaceSectionFound: boolean;
ImplementationSectionFound: boolean;
EndOfSourceFound: boolean;
procedure BuildTree(OnlyInterfaceNeeded: boolean); virtual;
procedure BuildTreeAndGetCleanPos(TreeRange: TTreeRange;
@ -3931,7 +3930,11 @@ procedure TPascalParserTool.BuildTreeAndGetCleanPos(
var
CaretType: integer;
IgnorePos: TCodePosition;
RealTreeRange: TTreeRange;
Node: TCodeTreeNode;
begin
RealTreeRange:=TreeRange;
//DebugLn(['TPascalParserTool.BuildTreeAndGetCleanPos ',MainFilename,' btSetIgnoreErrorPos=',btSetIgnoreErrorPos in BuildTreeFlags,' btKeepIgnoreErrorPos=',btKeepIgnoreErrorPos in BuildTreeFlags,' CursorPos=x=',CursorPos.X,',y=',CursorPos.Y]);
if (btSetIgnoreErrorPos in BuildTreeFlags) then begin
// ignore errors after cursor position
@ -3947,7 +3950,34 @@ begin
else if not (btKeepIgnoreErrorPos in BuildTreeFlags) then
ClearIgnoreErrorAfter;
if (TreeRange=trTillCursor) and (not UpdateNeeded(false)) then begin
if (RealTreeRange in [trTillCursor,trTillCursorSection]) then begin
// find out, if interface is enough
if (Tree<>nil) and (Tree.Root<>nil) then begin
Node:=Tree.Root;
while (Node<>nil) and (Node.Desc<>ctnImplementation) do
Node:=Node.NextBrother;
if Node<>nil then begin
// start of implementation section found
// => whole interface was read
CaretType:=CaretToCleanPos(CursorPos, CleanCursorPos);
if (CaretType=0) or (CaretType=-1) then begin
if (CleanCursorPos<=Node.StartPos)
and (not UpdateNeeded(true)) then begin
// interface section is already parsed, is still valid and
// cursor is in this section
exit;
end;
end;
end;
end;
if RealTreeRange=trTillCursorSection then begin
// interface is no enough => parse whole unit
RealTreeRange:=trAll;
end;
end;
if (RealTreeRange=trTillCursor) and (not UpdateNeeded(false)) then begin
// tree is valid
// -> if there was an error, raise it again
if (LastErrorPhase in [CodeToolPhaseScan,CodeToolPhaseParse])
@ -3971,7 +4001,7 @@ begin
end;
// parse code
BuildTree(TreeRange=trInterface);
BuildTree(RealTreeRange=trInterface);
if (not IgnoreErrorAfterValid) and (not EndOfSourceFound) then
SaveRaiseException(ctsEndOfSourceNotFound);
// find the CursorPos in cleaned source

4
ide/codehelp.pas
View File

@ -21,8 +21,8 @@
Author: Mattias Gaertner
Abstract:
This unit is part of the IDE's help system. It implements the help for sources via
fpdoc files and pascal comments.
This unit is part of the IDE's help system. It implements the help for
sources via fpdoc files and pascal comments.
}
unit CodeHelp;