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

codetools: fixed jump from uses to unit

Browse Source
This commit is contained in:
mattias 2025-01-01 15:27:12 +01:00
parent ab03974ccf
commit 6acd693a4b
3 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
components/codetools/finddeclarationtool.pas
View File

@ -2598,6 +2598,41 @@ begin
//Result:=IdentifierIsModuleName;
//if Result then
// exit;
{$ELSE}
if (CursorNode.Desc = ctnUseUnitNamespace) then begin
NewExprType.Desc:=xtContext;
NewExprType.Context.Node:=CursorNode;
NewExprType.Context.Tool:=Self;
CleanPosToCaret(CursorNode.StartPos, NewPos);
NewTopLine := NewPos.Y;
BlockTopLine := NewTopLine;
CleanPosToCaret(CursorNode.EndPos, NewPos);
BlockBottomLine := NewPos.Y;
Result := True;
Exit;
end else if (CursorNode.Desc in [ctnUsesSection,ctnUseUnitClearName]) then begin
// in uses section -> jump to unit
//DebugLn(['TFindDeclarationTool.FindDeclaration IsUsesSection']);
Result:=FindDeclarationInUsesSection(CursorNode,CleanCursorPos,
NewPos,NewTopLine);
BlockTopLine:=NewPos.Y;
BlockBottomLine:=NewPos.Y;
NewExprType:=CleanExpressionType;
{$IFDEF VerboseFindDeclarationFail}
if not Result then begin
debugln(['TFindDeclarationTool.FindDeclaration cursor in uses and FindDeclarationInUsesSection failed']);
end;
{$ENDIF}
if Result and (fsfSearchSourceName in SearchSmartFlags) then begin
Result:=FindSourceName(NewPos.Code);
{$IFDEF VerboseFindDeclarationFail}
if not Result then begin
debugln(['TFindDeclarationTool.FindDeclaration cursor in uses and FindSourceName failed']);
end;
{$ENDIF}
end;
exit;
end;
{$ENDIF}
DirectSearch:=false;
@ -4321,9 +4356,7 @@ begin
begin
// switch from ctnSrcName to ctnIdentifier
ExprType.Context.Node:=ExprType.Context.Node.FirstChild;
Params.SetResult(ExprType.Context);
end else
Params.SetResult(CleanFindContext);
end;
end else begin
if (ExprType.Context.Node.Desc in [ctnUseUnitNamespace, ctnUseUnitClearName])
and (KnownIdentLen=EndPos-StartPos) then
@ -4331,8 +4364,8 @@ begin
// switch to ctnUseUnit
ExprType.Context.Node:=ExprType.Context.Node.Parent;
end;
Params.SetResult(ExprType.Context);
end;
Params.SetResult(ExprType.Context);
end else
Params.SetResult(CleanFindContext);
@ -8703,7 +8736,7 @@ begin
DebugLn(['TFindDeclarationTool.FindIdentifierInUsesSection ',MainFilename,' fdfIgnoreUsedUnits=',fdfIgnoreUsedUnits in Params.Flags]);
{$ENDIF}
Result:=false;
// first search the identifier in the uses section (not in the interfaces of the units)
// first search the identifier in the uses section itself (not in the interfaces of the units)
if (Params.IdentifierTool=Self) then begin
Node:=UsesNode.LastChild;
while Node<>nil do begin
@ -8718,8 +8751,8 @@ begin
exit;
end;
end else if CompareSrcIdentifiers(Node.StartPos,Params.Identifier) then begin
// the searched identifier was a uses AUnitName, point to the identifier in
// the uses section
// the searched identifier was a uses unitname
// -> point to the identifier in the uses section
// if the unit name has a namespace defined point to the namespace
Params.SetResult(Self,Node.FirstChild);
Result:=true;

2
components/codetools/tests/laztests/tampersand.pas
View File

@ -60,7 +60,7 @@ end;
function fun(
&type: &tampersand.&var{completion:&var,xyz|completion:-1=&var,xyz|declaration:tampersand/var};
&begin: tampersand.&end{declaration:tampersand/end}
): &tampersand{completion:&tampersand,&program,xyz|completion:-1=&tampersand,&program,xyz|declaration!:tampersand}
): &tampersand{completion:&tampersand,&program,xyz|completion:-1=&tampersand,&program,xyz|declaration!:&tampersand}
.&program{completion:&program,xyz|completion:-1=&program,xyz|declaration:tampersand/program};
var
&then: &var;

6
components/codetools/tests/testfinddeclaration.pas
View File

@ -490,11 +490,11 @@ begin
IdentItem:=CodeToolBoss.IdentifierList.FilteredItems[i];
if IdentItem.Node<>nil then begin
FoundPath:=NodeAsPath(FoundTool,FoundNode);
//debugln(['TTestFindDeclaration.FindDeclarations FoundPath="',FoundPath,'"']);
//debugln(['TTestFindDeclaration.FindDeclarations i=',i,' FoundPath="',FoundPath,'"']);
if SameText(ExpectedTerm,FoundPath) then
break;
end;
//debugln(['TTestFindDeclaration.FindDeclarations ',IdentItem.Identifier]);
//debugln(['TTestFindDeclaration.FindDeclarations i=',i,' Identifier=',IdentItem.Identifier]);
s := IdentItem.Identifier;
if (iliNeedsAmpersand in IdentItem.Flags)
and (Marker = 'completion') // declaration=path.ident does not include the &
@ -523,7 +523,7 @@ begin
end else if Marker='guesstype' then begin
ExpectedType:=copy(Src,PathPos,CommentP-1-PathPos);
{$IFDEF VerboseFindDeclarationTests}
debugln(['TTestFindDeclaration.FindDeclarations "',Marker,'" at ',Tool.CleanPosToStr(NameStartPos-1),' ExpectedType=',ExpectedType]);
debugln(['TTestFindDeclaration.FindDeclarations "',Marker,'" at ',MainTool.CleanPosToStr(NameStartPos-1),' ExpectedType=',ExpectedType]);
{$ENDIF}
MainTool.CleanPosToCaret(IdentifierStartPos,CursorPos);