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

codetools: code completion: add proc for procvar: fixed reference-to

Browse Source 
git-svn-id: trunk@54692 -
This commit is contained in:
mattias 2017-04-22 18:10:28 +00:00
parent 3ca49ceb2b
commit e96ede4637
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/codetools/codecompletiontool.pas
View File

@ -1550,6 +1550,8 @@ begin
MethodDefinition:=TrimCodeSpace( MethodDefinition:=TrimCodeSpace(
ProcContext.Tool.ExtractProcHead(ProcContext.Node, ProcContext.Tool.ExtractProcHead(ProcContext.Node,
MethodAttr+[phpWithoutClassName,phpWithoutName])); MethodAttr+[phpWithoutClassName,phpWithoutName]));
if MethodDefinition='' then
RaiseException(20170422200434,'unknown proctype '+ProcContext.Node.DescAsString);
MethodDefinition:=Beauty.AddClassAndNameToProc(MethodDefinition, '', NewProcName); MethodDefinition:=Beauty.AddClassAndNameToProc(MethodDefinition, '', NewProcName);
debugln(['TCodeCompletionCodeTool.AddProcedureCompatibleToProcType MethodDefinition="',MethodDefinition,'"']); debugln(['TCodeCompletionCodeTool.AddProcedureCompatibleToProcType MethodDefinition="',MethodDefinition,'"']);
@ -2210,7 +2212,8 @@ begin
Params); Params);
if not Result then exit; if not Result then exit;
if ProcContext.Tool.ProcNodeHasOfObject(ProcContext.Node) then begin if ((AClassNode<>nil) and (ProcContext.Node.Desc=ctnReferenceTo))
or ProcContext.Tool.ProcNodeHasOfObject(ProcContext.Node) then begin
if AClassNode<>nil then begin if AClassNode<>nil then begin
{$IFDEF VerboseCompleteEventAssign} {$IFDEF VerboseCompleteEventAssign}
DebugLn(' CompleteEventAssignment: CreateEventFullName... UserEventAtom.StartPos=',dbgs(UserEventAtom.StartPos)); DebugLn(' CompleteEventAssignment: CreateEventFullName... UserEventAtom.StartPos=',dbgs(UserEventAtom.StartPos));

3
components/codetools/pascalparsertool.pas
View File

@ -4657,7 +4657,8 @@ end;
function TPascalParserTool.KeyWordFuncTypeReferenceTo: boolean; function TPascalParserTool.KeyWordFuncTypeReferenceTo: boolean;
begin begin
if cmsBlocks in Scanner.CompilerModeSwitches then begin if (cmsBlocks in Scanner.CompilerModeSwitches)
or (Scanner.PascalCompiler=pcPas2js) then begin
CreateChildNode; CreateChildNode;
CurNode.Desc:=ctnReferenceTo; CurNode.Desc:=ctnReferenceTo;
if not ReadNextUpAtomIs('TO') then if not ReadNextUpAtomIs('TO') then

4
components/codetools/pascalreadertool.pas
View File

@ -613,6 +613,10 @@ begin
ProcNode:=ProcNode.Parent; ProcNode:=ProcNode.Parent;
if ProcNode=nil then exit; if ProcNode=nil then exit;
end; end;
if ProcNode.Desc=ctnReferenceTo then begin
ProcNode:=ProcNode.FirstChild;
if ProcNode=nil then exit;
end;
if ProcNode.Desc=ctnProcedure then if ProcNode.Desc=ctnProcedure then
IsProcType:=false IsProcType:=false
else if ProcNode.Desc=ctnProcedureType then else if ProcNode.Desc=ctnProcedureType then

3
components/codetools/sourcechanger.pas
View File

@ -1896,6 +1896,9 @@ var
Level: Integer; Level: Integer;
begin begin
Result:=''; Result:='';
{$IFDEF VerboseAddClassAndNameToProc}
debugln(['TBeautifyCodeOptions.AddClassAndNameToProc AProcCode="',AProcCode,'" AClassName="',AClassName,'" AMethodName="',AMethodName,'"']);
{$ENDIF}
p:=1; p:=1;
ProcLen:=length(AProcCode); ProcLen:=length(AProcCode);
// read proc keyword 'procedure', 'function', ... // read proc keyword 'procedure', 'function', ...