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

codetools: code creation support in a parameter of procedure variables.

Browse Source 
git-svn-id: trunk@50308 -
This commit is contained in:
ondrej 2015-11-11 19:31:19 +00:00
parent 82018334bb
commit fb34c4b45f
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/codetools/codecompletiontool.pas
View File

@ -2483,6 +2483,18 @@ begin
MissingUnitName:='';
if Params.NewNode=nil then exit;
//DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter Proc/PropNode=',Params.NewNode.DescAsString,' ',copy(Params.NewCodeTool.Src,Params.NewNode.StartPos,50));
if Params.NewNode.Desc=ctnVarDefinition then
begin
try
ExprType:=Params.NewCodeTool.ConvertNodeToExpressionType(Params.NewNode,Params);
if (ExprType.Desc=xtContext) and (ExprType.Context.Node<>nil) then begin
Params.NewCodeTool:=ExprType.Context.Tool;
Params.NewNode:=ExprType.Context.Node;
end;
except
end;
end;
ParameterNode:=Params.NewCodeTool.FindNthParameterNode(Params.NewNode,
ParameterIndex);
if (ParameterNode=nil)

2
components/codetools/finddeclarationtool.pas
View File

@ -10874,7 +10874,7 @@ begin
{$IFDEF CheckNodeTool}CheckNodeTool(Node);{$ENDIF}
Result:=nil;
if Node=nil then exit;
if Node.Desc in [ctnProcedure] then begin
if Node.Desc in [ctnProcedure,ctnProcedureType] then begin
ProcNode:=Node;
//DebugLn(' FindNthParameterNode ProcNode="',copy(Params.NewCodeTool.Src,ProcNode.StartPos,ProcNode.EndPos-ProcNode.StartPos),'"');
FunctionNode:=nil;

2
components/codetools/pascalparsertool.pas
View File

@ -5820,7 +5820,7 @@ procedure TPascalParserTool.BuildSubTreeForProcHead(ProcNode: TCodeTreeNode;
begin
if ProcNode.Desc=ctnProcedureHead then
ProcNode:=ProcNode.Parent;
if ProcNode.Desc<>ctnProcedure then
if not(ProcNode.Desc in [ctnProcedure,ctnProcedureType]) then
RaiseException('INTERNAL ERROR: TPascalParserTool.BuildSubTreeForProcHead with FunctionResult');
BuildSubTreeForProcHead(ProcNode);
FunctionResult:=ProcNode.FirstChild.FirstChild;