paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 00:39:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed finding declaration and ancestors for unit name

Browse Source 
git-svn-id: trunk@6560 -
This commit is contained in:
mattias 2005-01-12 22:21:24 +00:00
parent a66dd7eb21
commit 3ccb0f5d03
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/codetools/finddeclarationtool.pas
View File

@ -469,7 +469,8 @@ type
// than declarations:
TFindSmartFlag = (
fsfIncludeDirective, // search for include file
fsfFindMainDeclaration // stop if already on a declaration
fsfFindMainDeclaration, // stop if already on a declaration
fsfSearchSourceName // if searching for a unit name, return the source name node
);
TFindSmartFlags = set of TFindSmartFlag;
@ -994,6 +995,25 @@ var CleanCursorPos: integer;
end;
end;
function FindSourceName(ACode: TCodeBuffer): boolean;
var
NamePos: TAtomPosition;
begin
Result:=false;
NewTool:=nil;
NewNode:=nil;
if Assigned(FOnGetCodeToolForBuffer) then
NewTool:=FOnGetCodeToolForBuffer(Self,ACode,false);
if NewTool=nil then exit;
NewTool.BuildTree(true);
if not NewTool.GetSourceNamePos(NamePos) then exit;
NewNode:=NewTool.Tree.Root;
if not NewTool.JumpToCleanPos(NamePos.StartPos,NamePos.StartPos,
NamePos.StartPos,NewPos,NewTopLine,false)
then exit;
Result:=true;
end;
var
CleanPosInFront: integer;
CursorAtIdentifier: boolean;
@ -1058,6 +1078,8 @@ begin
NewPos,NewTopLine);
NewNode:=nil;
NewTool:=nil;
if fsfSearchSourceName in SearchSmartFlags then
Result:=FindSourceName(NewPos.Code);
exit;
end;
DirectSearch:=false;
@ -2860,13 +2882,23 @@ begin
CurCursorPos:=CursorPos;
CurTool:=Self;
try
while CurTool.FindDeclaration(CurCursorPos,AllFindSmartFlags,
while CurTool.FindDeclaration(CurCursorPos,AllFindSmartFlags
+[fsfSearchSourceName],
NewTool,NewNode,NewPos,NewTopLine) do
begin
if IndexOfCodePosition(@NewPos)>=0 then break;
AddCodePosition(NewPos);
CurCursorPos:=NewPos;
CurTool:=NewTool;
{$IFDEF VerboseFindWithAncestors}
debugln('TFindDeclarationTool.FindDeclarationsAndAncestors ',
' Self="',MainFilename,'" ');
if CurCursorPos.Code<>nil then
debugln(' CurCursorPos=',CurCursorPos.Code.Filename,' ',dbgs(CurCursorPos.X),',',dbgs(CurCursorPos.Y));
if CurTool<>nil then
debugln(' CurTool=',CurTool.MainFilename);
{$ENDIF}
if (CurTool=nil) then exit;
end;
except
// just stop on errors