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

codetools: property completion: fixed check if store accessor with index specififer exists

Browse Source 
git-svn-id: trunk@55915 -
This commit is contained in:
mattias 2017-09-24 16:38:12 +00:00
parent a2bbfb69bf
commit dd43ceac8e
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
components/codetools/codecompletiontool.pas
View File

@ -486,6 +486,7 @@ function TCodeCompletionCodeTool.FindProcInCodeCompleteClass(
// NameAndParams should be uppercase and contains the proc name and the
// parameter list without names and default values
// and should not contain any comments and no result type
// e.g. DOIT(LONGINT;STRING)
var
ANodeExt: TCodeTreeNodeExtension;
Params: TFindDeclarationParams;
@ -7574,28 +7575,40 @@ var
end else
AccessParam:=PropName
+BeautifyCodeOpts.PropertyStoredIdentPostfix;
CleanAccessFunc:=UpperCaseStr(AccessParam);
// check if procedure exists
if (not ProcExistsInCodeCompleteClass(CleanAccessFunc+';'))
and (not VarExistsInCodeCompleteClass(CleanAccessFunc))
then begin
// add insert demand for function
// build function code
if Parts[ppIndexWord].StartPos < 1 then begin
// no index
if (Parts[ppIndexWord].StartPos<1) then begin
// no index -> check if method or field exists
CleanAccessFunc:=UpperCaseStr(AccessParam);
if (not ProcExistsInCodeCompleteClass(CleanAccessFunc+';'))
and (not VarExistsInCodeCompleteClass(CleanAccessFunc))
then begin
// add insert demand for function
// build function code
AccessFunc := 'function ' + AccessParam + ':Boolean;';
CleanAccessFunc := CleanAccessFunc+';';
end else begin
// index
if IsClassProp then
AccessFunc:='class '+AccessFunc+' static;';;
// add new Insert Node
if CompleteProperties then
AddClassInsertion(CleanAccessFunc,AccessFunc,AccessParam,
ncpPrivateProcs,PropNode);
end;
end else begin
// has index specifier -> check if method exists
CleanAccessFunc:=UpperCaseStr(AccessParam);
if (not ProcExistsInCodeCompleteClass(CleanAccessFunc+'('+UpperCaseStr(IndexType)+');'))
and (not VarExistsInCodeCompleteClass(CleanAccessFunc))
then begin
// add insert demand for function
// build function code
AccessFunc := 'function ' + AccessParam + '(AIndex:'+IndexType+'):Boolean;';
CleanAccessFunc := UpperCaseStr(CleanAccessFunc + '('+IndexType+');');
if IsClassProp then
AccessFunc:='class '+AccessFunc+' static;';;
// add new Insert Node
if CompleteProperties then
AddClassInsertion(CleanAccessFunc,AccessFunc,AccessParam,
ncpPrivateProcs,PropNode);
end;
if IsClassProp then
AccessFunc:='class '+AccessFunc+' static;';;
// add new Insert Node
if CompleteProperties then
AddClassInsertion(CleanAccessFunc,AccessFunc,AccessParam,
ncpPrivateProcs,PropNode);
end;
if Parts[ppStored].StartPos<0 then begin
// insert stored specifier