paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-19 22:29:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: identifier completion: GetParamTypeList: catch error

Browse Source 
git-svn-id: trunk@44358 -
This commit is contained in:
mattias 2014-03-05 18:30:46 +00:00
parent 7e3b2a63bc
commit aa4c4a8a9e
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/codetools/identcompletiontool.pas
View File

@ -3081,13 +3081,17 @@ begin
// Note: if you implement param lists for other than ctnProcedure, check
// CompareParamList
ANode:=Node;
FParamTypeList:='';
if (ANode<>nil) and (ANode.Desc=ctnProcedure) then begin
FParamTypeList:=Tool.ExtractProcHead(ANode,
[phpWithoutClassKeyword,phpWithoutClassName,
phpWithoutName,phpInUpperCase]);
//debugln('TIdentifierListItem.GetParamTypeList A ',GetIdentifier(Identifier),' ',Tool.MainFilename,' ',dbgs(CurNode.StartPos));
end else
FParamTypeList:='';
try
FParamTypeList:=Tool.ExtractProcHead(ANode,
[phpWithoutClassKeyword,phpWithoutClassName,
phpWithoutName,phpInUpperCase]);
//debugln('TIdentifierListItem.GetParamTypeList A ',GetIdentifier(Identifier),' ',Tool.MainFilename,' ',dbgs(CurNode.StartPos));
except
on E: ECodeToolError do ; // ignore syntax errors
end;
end;
Include(Flags,iliParamTypeListValid);
end;
Result:=FParamTypeList;
@ -3101,13 +3105,17 @@ begin
// Note: if you implement param lists for other than ctnProcedure, check
// CompareParamList
ANode:=Node;
FParamNameList:='';
if (ANode<>nil) and (ANode.Desc=ctnProcedure) then begin
FParamNameList:=Tool.ExtractProcHead(ANode,
[phpWithoutClassKeyword,phpWithoutClassName,
phpWithoutName,phpInUpperCase,phpWithParameterNames]);
//debugln('TIdentifierListItem.GetParamNameList A ',GetIdentifier(Identifier),' ',Tool.MainFilename,' ',dbgs(CurNode.StartPos));
end else
FParamNameList:='';
try
FParamNameList:=Tool.ExtractProcHead(ANode,
[phpWithoutClassKeyword,phpWithoutClassName,
phpWithoutName,phpInUpperCase,phpWithParameterNames]);
//debugln('TIdentifierListItem.GetParamNameList A ',GetIdentifier(Identifier),' ',Tool.MainFilename,' ',dbgs(CurNode.StartPos));
except
on E: ECodeToolError do ; // ignore syntax errors
end;
end;
Include(Flags,iliParamNameListValid);
end;
Result:=FParamNameList;