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

codetools: identifier completion after inherited, bug #10560

Browse Source 
git-svn-id: trunk@19605 -
This commit is contained in:
mattias 2009-04-24 11:44:36 +00:00
parent a258bd419f
commit ee6cc0c5be
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/codetoolmanager.pas
View File

@ -1730,7 +1730,9 @@ begin
NewX:=NewPos.X;
NewY:=NewPos.Y;
NewCode:=NewPos.Code;
{$IFDEF CTDEBUG}
debugln(['TCodeToolManager.FindDeclaration ',DbgsCXY(NewPos)]);
{$ENDIF}
end;
{$IFDEF DoNotHandleFindDeclException}
finally

47
components/codetools/finddeclarationtool.pas
View File

@ -5997,6 +5997,7 @@ var
var
ProcNode: TCodeTreeNode;
ClassOfMethodContext: TFindContext;
HasIdentifier: Boolean;
begin
// for example: inherited A;
// inherited skips the class and begins to search in the ancestor class
@ -6009,14 +6010,17 @@ var
MoveCursorToCleanPos(CurAtom.StartPos);
RaiseException(ctsInheritedKeywordOnlyAllowedInMethods);
end;
if not (NextAtomType in [vatIdentifier,vatPreDefIdentifier]) then
begin
MoveCursorToCleanPos(NextAtom.StartPos);
ReadNextAtom;
RaiseIdentExpected;
end;
HasIdentifier:=NextAtom.EndPos<=EndPos;
if HasIdentifier then begin
if (not (NextAtomType in [vatIdentifier,vatPreDefIdentifier])) then
begin
MoveCursorToCleanPos(NextAtom.StartPos);
ReadNextAtom;
RaiseIdentExpected;
end;
ReadNextExpressionAtom;
ReadNextExpressionAtom;
end;
{$IFDEF ShowExprEval}
DebugLn(' ResolveINHERITED CurAtomType=',
VariableAtomTypeNames[CurAtomType],
@ -6037,17 +6041,23 @@ var
ClassOfMethodContext.Tool.FindAncestorOfClass(ClassOfMethodContext.Node,
Params,true);
// search identifier only in class ancestor
Params.Load(OldInput,false);
Params.SetIdentifier(Self,@Src[CurAtom.StartPos],@CheckSrcIdentifier);
Params.ContextNode:=Params.NewNode;
Params.Flags:=Params.Flags-[fdfSearchInParentNodes]
+[fdfExceptionOnNotFound,fdfSearchInAncestors];
Params.NewCodeTool.FindIdentifierInContext(Params);
ExprType.Context:=CreateFindContext(Params);
Params.Load(OldInput,true);
if HasIdentifier then begin
// search identifier only in class ancestor
Params.Load(OldInput,false);
Params.SetIdentifier(Self,@Src[CurAtom.StartPos],@CheckSrcIdentifier);
Params.ContextNode:=Params.NewNode;
Params.Flags:=Params.Flags-[fdfSearchInParentNodes]
+[fdfExceptionOnNotFound,fdfSearchInAncestors];
Params.NewCodeTool.FindIdentifierInContext(Params);
ExprType.Context:=CreateFindContext(Params);
Params.Load(OldInput,true);
ResolveBaseTypeOfIdentifier;
ResolveBaseTypeOfIdentifier;
end else begin
// the keyword 'inherited' is the last atom
// return the ancestor class context
ExprType.Context:=CreateFindContext(Params);
end;
end;
begin
@ -6063,6 +6073,9 @@ begin
{$ENDIF}
if not InitAtomQueue then exit;
{$IFDEF ShowExprEval}
DebugLn(['TFindDeclarationTool.FindExpressionTypeOfVariable Expression="',copy(Src,StartPos,EndPos-StartPos),'"']);
{$ENDIF}
ExprType.Desc:=xtContext;
ExprType.SubDesc:=xtNone;
ExprType.Context:=StartContext;