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

codetools: CompleteLocalVariableAsParameter: fixed skipping sub context

Browse Source 
git-svn-id: trunk@27977 -
This commit is contained in:
mattias 2010-10-30 14:10:21 +00:00
parent 215cc0bd0a
commit 5f8d11d5c2
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/codetools/codecompletiontool.pas
View File

@ -1857,16 +1857,15 @@ begin
ExprType:=FindExpressionResultType(Params,ProcStartPos,ProcNameAtom.StartPos);
if ExprType.Desc<>xtContext then exit;
Context:=ExprType.Context;
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter search proc in sub context']);
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter search proc in sub context: ',ExprTypeToString(ExprType)]);
end;
// find declaration of parameter list
Params.ContextNode:=Context.Node;
Params.SetIdentifier(Self,@Src[ProcNameAtom.StartPos],nil);
Params.Flags:=fdfGlobals+[fdfSearchInAncestors,
fdfFindVariable,fdfIgnoreCurContextNode];
Params.Flags:=fdfGlobals+[fdfSearchInAncestors,fdfFindVariable];
if Context.Node=CursorNode then
Include(Params.Flags,fdfSearchInParentNodes);
Params.Flags:=Params.Flags+[fdfSearchInParentNodes,fdfIgnoreCurContextNode];
CleanPosToCodePos(VarNameAtom.StartPos,IgnorePos);
IgnoreErrorAfter:=IgnorePos;
try
@ -1878,7 +1877,7 @@ begin
NewType:='';
MissingUnitName:='';
if Params.NewNode<>nil then begin
DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter Proc/PropNode=',Params.NewNode.DescAsString,' ',copy(Params.NewCodeTool.Src,Params.NewNode.StartPos,50));
//DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter Proc/PropNode=',Params.NewNode.DescAsString,' ',copy(Params.NewCodeTool.Src,Params.NewNode.StartPos,50));
ParameterNode:=Params.NewCodeTool.FindNthParameterNode(Params.NewNode,
ParameterIndex);
if (ParameterNode=nil)
@ -1887,7 +1886,7 @@ begin
exit;
end;
if ParameterNode<>nil then begin
DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter ParameterNode=',ParameterNode.DescAsString,' ',copy(Params.NewCodeTool.Src,ParameterNode.StartPos,50));
//DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter ParameterNode=',ParameterNode.DescAsString,' ',copy(Params.NewCodeTool.Src,ParameterNode.StartPos,50));
TypeNode:=FindTypeNodeOfDefinition(ParameterNode);
if TypeNode=nil then begin
DebugLn(' CompleteLocalVariableAsParameter Parameter has no type');

8
components/codetools/finddeclarationtool.pas
View File

@ -3022,7 +3022,7 @@ begin
'"'+GetIdentifier(Params.Identifier)+'"',
' Context="'+ContextNode.DescAsString+'" "'+StringToPascalConst(copy(Src,ContextNode.StartPos,20)),'"',
' File="'+ExtractFilename(MainFilename)+'"',
' Flags=['+FindDeclarationFlagsAsString(Params.Flags)+']'
' Flags=['+dbgs(Params.Flags)+']'
);
{$ELSE}
{$IFDEF ShowCollect}
@ -3031,7 +3031,7 @@ begin
'"',GetIdentifier(Params.Identifier),'"',
' Context="',ContextNode.DescAsString,'" "',copy(Src,ContextNode.StartPos,20),'"',
' File="',ExtractFilename(MainFilename)+'"',
' Flags=[',FindDeclarationFlagsAsString(Params.Flags),']'
' Flags=[',dbgs(Params.Flags),']'
]);
end;
{$ENDIF}
@ -3054,7 +3054,7 @@ begin
DebugLn('[TFindDeclarationTool.FindIdentifierInContext] Loop Ident=',
'"',GetIdentifier(Params.Identifier),'"',
' Context="',ContextNode.DescAsString,'" "',copy(Src,ContextNode.StartPos,20),'"',
' Flags=[',FindDeclarationFlagsAsString(Params.Flags),']'
' Flags=[',dbgs(Params.Flags),']'
);
{$ELSE}
{$IFDEF ShowCollect}
@ -3062,7 +3062,7 @@ begin
DebugLn('[TFindDeclarationTool.FindIdentifierInContext] COLLECT Loop Ident=',
'"',GetIdentifier(Params.Identifier),'"',
' Context="',ContextNode.DescAsString,'" "',copy(Src,ContextNode.StartPos,20),'"',
' Flags=[',FindDeclarationFlagsAsString(Params.Flags),']'
' Flags=[',dbgs(Params.Flags),']'
);
end;
{$ENDIF}