mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-27 21:00:23 +02:00
codetools: complete parameter: methods
git-svn-id: trunk@34723 -
This commit is contained in:
mattias
parent
4b54faa3c2
commit
5010a42914
@ -1871,6 +1871,11 @@ var
|
||||
HasAtOperator: Boolean;
|
||||
TypeTool: TFindDeclarationTool;
|
||||
AliasType: TFindContext;
|
||||
AClassNode: TCodeTreeNode;
|
||||
Identifier: String;
|
||||
ProcContext: TFindContext;
|
||||
AMethodDefinition: string;
|
||||
AMethodAttr: TProcHeadAttributes;
|
||||
begin
|
||||
Result:=false;
|
||||
|
||||
@ -1896,17 +1901,16 @@ begin
|
||||
and (Src[VarNameAtom.StartPos]='@') then begin
|
||||
HasAtOperator:=true;
|
||||
inc(VarNameAtom.StartPos);
|
||||
// ToDo: create event: @OnClick to a TNotifyEvent create a method
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter HasAtOperator ',GetAtom(VarNameAtom)]);
|
||||
end;
|
||||
if not IsValidIdent(GetAtom(VarNameAtom)) then exit;
|
||||
Identifier:=GetAtom(VarNameAtom);
|
||||
if not IsValidIdent(Identifier) then exit;
|
||||
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn(' CompleteLocalVariableAsParameter VarNameAtom=',GetAtom(VarNameAtom),' ProcNameAtom=',GetAtom(ProcNameAtom),' ParameterIndex=',dbgs(ParameterIndex));
|
||||
{$ENDIF}
|
||||
|
||||
// search variable
|
||||
ActivateGlobalWriteLock;
|
||||
Params:=TFindDeclarationParams.Create;
|
||||
try
|
||||
{$IFDEF CTDEBUG}
|
||||
@ -1952,92 +1956,113 @@ begin
|
||||
end;
|
||||
NewType:='';
|
||||
MissingUnitName:='';
|
||||
if Params.NewNode<>nil then begin
|
||||
//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)
|
||||
and (Params.NewNode.Desc in [ctnProperty,ctnProcedure]) then begin
|
||||
DebugLn([' CompleteLocalVariableAsParameter Procedure has less than ',ParameterIndex+1,' parameters']);
|
||||
exit;
|
||||
end;
|
||||
if ParameterNode<>nil then begin
|
||||
//DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter ParameterNode=',ParameterNode.DescAsString,' ',copy(Params.NewCodeTool.Src,ParameterNode.StartPos,50));
|
||||
TypeTool:=Params.NewCodeTool;
|
||||
TypeNode:=FindTypeNodeOfDefinition(ParameterNode);
|
||||
if TypeNode=nil then begin
|
||||
DebugLn(' CompleteLocalVariableAsParameter Parameter has no type');
|
||||
exit;
|
||||
end;
|
||||
// default: copy the type
|
||||
NewType:=TypeTool.ExtractCode(TypeNode.StartPos,TypeNode.EndPos,[]);
|
||||
|
||||
// search type
|
||||
Params.Clear;
|
||||
Params.ContextNode:=TypeNode;
|
||||
Params.Flags:=[fdfSearchInParentNodes,fdfSearchInAncestors,
|
||||
fdfTopLvlResolving];
|
||||
AliasType:=CleanFindContext;
|
||||
ExprType:=TypeTool.FindExpressionResultType(Params,
|
||||
TypeNode.StartPos,TypeNode.EndPos,@AliasType);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter parameter type: AliasType=',FindContextToString(AliasType)]);
|
||||
|
||||
if HasAtOperator then begin
|
||||
debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter HasAtOperator ExprType=',ExprTypeToString(ExprType)]);
|
||||
NewType:='';
|
||||
if (ExprType.Desc=xtContext)
|
||||
and (ExprType.Context.Node<>nil) then begin
|
||||
TypeNode:=ExprType.Context.Node;
|
||||
TypeTool:=ExprType.Context.Tool;
|
||||
if (TypeNode.Desc=ctnPointerType) then begin
|
||||
// for example PMapID = ^...
|
||||
if (TypeNode.FirstChild<>nil)
|
||||
and (TypeNode.FirstChild.Desc=ctnIdentifier) then begin
|
||||
// for example PMapID = ^TMapID
|
||||
NewType:=TypeTool.ExtractCode(TypeNode.FirstChild.StartPos,
|
||||
TypeNode.FirstChild.EndPos,[]);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter pointer to ',NewType]);
|
||||
Params.Clear;
|
||||
Params.ContextNode:=TypeNode;
|
||||
Params.Flags:=fdfDefaultForExpressions;
|
||||
AliasType:=CleanFindContext;
|
||||
ExprType:=TypeTool.FindExpressionResultType(Params,
|
||||
TypeNode.FirstChild.StartPos,TypeNode.FirstChild.EndPos,
|
||||
@AliasType);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter parameter is pointer to type: AliasType=',FindContextToString(AliasType)]);
|
||||
end;
|
||||
end else if TypeNode.Desc=ctnProcedureType then begin
|
||||
// for example TNotifyEvent = procedure(...
|
||||
|
||||
//Result:=AddMethodCompatibleToProcType();
|
||||
//exit;
|
||||
end;
|
||||
end;
|
||||
if NewType='' then begin
|
||||
debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter parameter has @ operator, but this is not implemented for ',ExprTypeToString(ExprType)]);
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
if AliasType.Node<>nil then begin
|
||||
// an identifier
|
||||
MissingUnitName:=GetUnitNameForUsesSection(AliasType.Tool);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter MissingUnitName=',MissingUnitName]);
|
||||
end;
|
||||
|
||||
//DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter NewType=',NewType);
|
||||
if NewType='' then
|
||||
RaiseException('CompleteLocalVariableAsParameter Internal error: NewType=""');
|
||||
end;
|
||||
//DebugLn(' CompleteLocalVariableAsParameter Dont know: ',Params.NewNode.DescAsString);
|
||||
end;
|
||||
|
||||
if NewType='' then begin
|
||||
if Params.NewNode=nil then exit;
|
||||
//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)
|
||||
and (Params.NewNode.Desc in [ctnProperty,ctnProcedure]) then begin
|
||||
DebugLn([' CompleteLocalVariableAsParameter Procedure has less than ',ParameterIndex+1,' parameters']);
|
||||
exit;
|
||||
end;
|
||||
|
||||
if ParameterNode=nil then exit;
|
||||
//DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter ParameterNode=',ParameterNode.DescAsString,' ',copy(Params.NewCodeTool.Src,ParameterNode.StartPos,50));
|
||||
TypeTool:=Params.NewCodeTool;
|
||||
TypeNode:=FindTypeNodeOfDefinition(ParameterNode);
|
||||
if TypeNode=nil then begin
|
||||
DebugLn(' CompleteLocalVariableAsParameter Parameter has no type');
|
||||
exit;
|
||||
end;
|
||||
// default: copy the type
|
||||
NewType:=TypeTool.ExtractCode(TypeNode.StartPos,TypeNode.EndPos,[]);
|
||||
|
||||
// search type
|
||||
Params.Clear;
|
||||
Params.ContextNode:=TypeNode;
|
||||
Params.Flags:=[fdfSearchInParentNodes,fdfSearchInAncestors,
|
||||
fdfTopLvlResolving];
|
||||
AliasType:=CleanFindContext;
|
||||
ExprType:=TypeTool.FindExpressionResultType(Params,
|
||||
TypeNode.StartPos,TypeNode.EndPos,@AliasType);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter parameter type: AliasType=',FindContextToString(AliasType)]);
|
||||
|
||||
if HasAtOperator then begin
|
||||
debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter HasAtOperator ExprType=',ExprTypeToString(ExprType)]);
|
||||
NewType:='';
|
||||
if (ExprType.Desc<>xtContext)
|
||||
or (ExprType.Context.Node=nil) then begin
|
||||
debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter parameter has @ operator, but this is not implemented for ',ExprTypeToString(ExprType)]);
|
||||
exit;
|
||||
end;
|
||||
TypeNode:=ExprType.Context.Node;
|
||||
TypeTool:=ExprType.Context.Tool;
|
||||
if (TypeNode.Desc=ctnPointerType) then begin
|
||||
// for example PMapID = ^...
|
||||
if (TypeNode.FirstChild<>nil)
|
||||
and (TypeNode.FirstChild.Desc=ctnIdentifier) then begin
|
||||
// for example PMapID = ^TMapID
|
||||
NewType:=TypeTool.ExtractCode(TypeNode.FirstChild.StartPos,
|
||||
TypeNode.FirstChild.EndPos,[]);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter pointer to ',NewType]);
|
||||
Params.Clear;
|
||||
Params.ContextNode:=TypeNode;
|
||||
Params.Flags:=fdfDefaultForExpressions;
|
||||
AliasType:=CleanFindContext;
|
||||
ExprType:=TypeTool.FindExpressionResultType(Params,
|
||||
TypeNode.FirstChild.StartPos,TypeNode.FirstChild.EndPos,
|
||||
@AliasType);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter parameter is pointer to type: AliasType=',FindContextToString(AliasType)]);
|
||||
end;
|
||||
end else if TypeNode.Desc=ctnProcedureType then begin
|
||||
// for example TNotifyEvent = procedure(...
|
||||
if TypeTool.ProcNodeHasOfObject(TypeNode) then begin
|
||||
// this needs a method => search class of method
|
||||
AClassNode:=FindClassOrInterfaceNode(CursorNode,true);
|
||||
if (AClassNode=nil) then
|
||||
RaiseException('parameter needs a method');
|
||||
ProcContext:=CreateFindContext(TypeTool,TypeNode);
|
||||
|
||||
// create new method
|
||||
if not AddMethodCompatibleToProcType(AClassNode,Identifier,
|
||||
ProcContext,AMethodDefinition,AMethodAttr,SourceChangeCache)
|
||||
then
|
||||
exit(true);
|
||||
|
||||
// apply the changes
|
||||
if not SourceChangeCache.Apply then
|
||||
RaiseException(ctsUnableToApplyChanges);
|
||||
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn(' CompleteLocalVariableByParameter: jumping to new method body...');
|
||||
{$ENDIF}
|
||||
// jump to new method body
|
||||
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine,false)
|
||||
then
|
||||
RaiseException('CompleteLocalVariableByParameter JumpToMethod failed');
|
||||
|
||||
exit(true);
|
||||
end else begin
|
||||
// ToDo: add procedure
|
||||
end;
|
||||
end;
|
||||
if NewType='' then begin
|
||||
debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter parameter has @ operator, but this is not implemented for ',ExprTypeToString(ExprType)]);
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
if AliasType.Node<>nil then begin
|
||||
// an identifier
|
||||
MissingUnitName:=GetUnitNameForUsesSection(AliasType.Tool);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteLocalVariableByParameter MissingUnitName=',MissingUnitName]);
|
||||
end;
|
||||
|
||||
//DebugLn('TCodeCompletionCodeTool.CompleteLocalVariableAsParameter NewType=',NewType);
|
||||
if NewType='' then
|
||||
RaiseException('CompleteLocalVariableAsParameter Internal error: NewType=""');
|
||||
//DebugLn(' CompleteLocalVariableAsParameter Dont know: ',Params.NewNode.DescAsString);
|
||||
|
||||
finally
|
||||
Params.Free;
|
||||
DeactivateGlobalWriteLock;
|
||||
end;
|
||||
|
||||
Result:=AddLocalVariable(CleanCursorPos,OldTopLine,GetAtom(VarNameAtom),
|
||||
|
||||
@ -126,6 +126,7 @@ type
|
||||
function PositionInFuncResultName(ProcNode: TCodeTreeNode;
|
||||
CleanPos: integer): boolean;
|
||||
function ProcNodeHasParamList(ProcNode: TCodeTreeNode): boolean;
|
||||
function ProcNodeHasOfObject(ProcNode: TCodeTreeNode): boolean;
|
||||
function GetProcParamList(ProcNode: TCodeTreeNode;
|
||||
Parse: boolean = true): TCodeTreeNode;
|
||||
function NodeIsInAMethod(Node: TCodeTreeNode): boolean;
|
||||
@ -837,9 +838,10 @@ end;
|
||||
procedure TPascalReaderTool.MoveCursorToFirstProcSpecifier(ProcNode: TCodeTreeNode);
|
||||
// After the call,
|
||||
// CurPos will stand on the first proc specifier or on a semicolon
|
||||
// this can be 'of object'
|
||||
begin
|
||||
//DebugLn(['TPascalReaderTool.MoveCursorToFirstProcSpecifier ',ProcNode.DescAsString,' ',ProcNode.StartPos]);
|
||||
if (ProcNode<>nil) and (ProcNode.Desc<>ctnProcedureHead) then
|
||||
if (ProcNode<>nil) and (ProcNode.Desc in [ctnProcedureType,ctnProcedure]) then
|
||||
ProcNode:=ProcNode.FirstChild;
|
||||
if (ProcNode=nil) or (ProcNode.Desc<>ctnProcedureHead) then begin
|
||||
SaveRaiseException('Internal Error in'
|
||||
@ -863,9 +865,9 @@ begin
|
||||
if AtomIsIdentifier(false) then begin
|
||||
// read name
|
||||
ReadNextAtom;
|
||||
if (CurPos.Flag=cafPoint) then begin
|
||||
// read method name
|
||||
while (CurPos.Flag=cafPoint) do begin
|
||||
ReadNextAtom;
|
||||
if CurPos.Flag<>cafWord then break;
|
||||
ReadNextAtom;
|
||||
end;
|
||||
end;
|
||||
@ -880,10 +882,10 @@ begin
|
||||
ReadNextAtom;
|
||||
if AtomIsIdentifier(false) then begin
|
||||
ReadNextAtom;
|
||||
if CurPos.Flag=cafPoint then begin
|
||||
while CurPos.Flag=cafPoint do begin
|
||||
ReadNextAtom;
|
||||
if not AtomIsIdentifier(false) then break;
|
||||
ReadNextAtom;
|
||||
if AtomIsIdentifier(false) then
|
||||
ReadNextAtom;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
@ -2456,6 +2458,18 @@ begin
|
||||
Result:=CurPos.Flag=cafRoundBracketOpen;
|
||||
end;
|
||||
|
||||
function TPascalReaderTool.ProcNodeHasOfObject(ProcNode: TCodeTreeNode
|
||||
): boolean;
|
||||
begin
|
||||
|
||||
// ToDo: ppu, dcu
|
||||
|
||||
Result:=false;
|
||||
if (ProcNode=nil) or (ProcNode.Desc<>ctnProcedureType) then exit;
|
||||
MoveCursorToFirstProcSpecifier(ProcNode);
|
||||
Result:=UpAtomIs('OF') and ReadNextUpAtomIs('OBJECT');
|
||||
end;
|
||||
|
||||
function TPascalReaderTool.GetProcParamList(ProcNode: TCodeTreeNode;
|
||||
Parse: boolean): TCodeTreeNode;
|
||||
begin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user