mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-10-24 09:11:44 +02:00
codetools: completecode: update proc signatures, IDE: options to disable updating multiple signatures
git-svn-id: trunk@41881 -
This commit is contained in:
mattias
parent
52a80e24b4
commit
7397ad3c22
@ -114,7 +114,7 @@ const
|
||||
ctnClassPublic, // pcsPublic
|
||||
ctnClassPublished // pcsPublished
|
||||
);
|
||||
|
||||
|
||||
type
|
||||
TCodeCompletionCodeTool = class;
|
||||
|
||||
@ -122,9 +122,10 @@ type
|
||||
|
||||
TCodeCompletionCodeTool = class(TMethodJumpingCodeTool)
|
||||
private
|
||||
ASourceChangeCache: TSourceChangeCache;
|
||||
FCompletingCursorNode: TCodeTreeNode;
|
||||
FSourceChangeCache: TSourceChangeCache;
|
||||
FCodeCompleteClassNode: TCodeTreeNode; // the class that is to be completed (ctnClass, ...)
|
||||
FCompletingStartNode: TCodeTreeNode; // the first variable/method/GUID node in FCodeCompleteClassNode
|
||||
FCompletingFirstEntryNode: TCodeTreeNode; // the first variable/method/GUID node in FCodeCompleteClassNode
|
||||
FAddInheritedCodeToOverrideMethod: boolean;
|
||||
FCompleteProperties: boolean;
|
||||
FirstInsert: TCodeTreeNodeExtension; // list of insert requests
|
||||
@ -136,9 +137,14 @@ type
|
||||
fNewMainUsesSectionUnits: TAVLTree; // tree of AnsiString
|
||||
procedure AddNewPropertyAccessMethodsToClassProcs(ClassProcs: TAVLTree;
|
||||
const TheClassName: string);
|
||||
function UpdateProcBodySignatures(ClassProcs, ProcBodyNodes: TAVLTree;
|
||||
ProcAttrCopyDefToBody: TProcHeadAttributes; out ProcsCopied: boolean): boolean;
|
||||
procedure GuessMethodDefBodyMapping(ClassProcs, ProcBodyNodes: TAVLTree);
|
||||
function UpdateProcBodySignature(ProcBodyNodes: TAVLTree;
|
||||
const BodyNodeExt: TCodeTreeNodeExtension;
|
||||
ProcAttrCopyDefToBody: TProcHeadAttributes; var ProcsCopied: boolean): boolean;
|
||||
function UpdateProcBodySignatures(ProcDefNodes, ProcBodyNodes: TAVLTree;
|
||||
ProcAttrCopyDefToBody: TProcHeadAttributes; out ProcsCopied: boolean;
|
||||
OnlyNode: TCodeTreeNode = nil): boolean;
|
||||
procedure GuessProcDefBodyMapping(ProcDefNodes, ProcBodyNodes: TAVLTree;
|
||||
MapByNameOnly, MapLastOne: boolean);
|
||||
function GatherClassProcDefinitions(ClassNode: TCodeTreeNode;
|
||||
RemoveAbstracts: boolean): TAVLTree;
|
||||
function GatherClassProcBodies(ClassNode: TCodeTreeNode): TAVLTree;
|
||||
@ -161,7 +167,7 @@ type
|
||||
function InsertAllNewUnitsToMainUsesSection: boolean;
|
||||
function FindClassMethodsComment(StartPos: integer;
|
||||
out CommentStart, CommentEnd: integer): boolean;
|
||||
function CreateMissingProcBodies: boolean;
|
||||
function CreateMissingClassProcBodies(UpdateSignatures: boolean): boolean;
|
||||
function ApplyChangesAndJumpToFirstNewProc(CleanPos: integer;
|
||||
OldTopLine: integer; AddMissingProcBodies: boolean;
|
||||
out NewPos: TCodeXYPosition; out NewTopLine: integer): boolean;
|
||||
@ -235,7 +241,7 @@ type
|
||||
property CodeCompleteClassNode: TCodeTreeNode
|
||||
read FCodeCompleteClassNode write SetCodeCompleteClassNode;
|
||||
property CodeCompleteSrcChgCache: TSourceChangeCache
|
||||
read ASourceChangeCache write SetCodeCompleteSrcChgCache;
|
||||
read FSourceChangeCache write SetCodeCompleteSrcChgCache;
|
||||
public
|
||||
constructor Create;
|
||||
function CompleteCode(CursorPos: TCodeXYPosition; OldTopLine: integer;
|
||||
@ -357,7 +363,8 @@ type
|
||||
const Body: string = '');
|
||||
procedure AddNeededUnitsToMainUsesSectionForRange(
|
||||
StartPos, EndPos: integer; CompletionTool: TCodeCompletionCodeTool);
|
||||
|
||||
public
|
||||
// Options
|
||||
property SetPropertyVariablename: string read FSetPropertyVariablename
|
||||
write FSetPropertyVariablename;
|
||||
property CompleteProperties: boolean read FCompleteProperties
|
||||
@ -424,7 +431,7 @@ begin
|
||||
end;
|
||||
// ToDo: check ancestor procs too
|
||||
// search in current class
|
||||
Result:=(FindProcNode(FCompletingStartNode,NameAndParamsUpCase,[phpInUpperCase])<>nil);
|
||||
Result:=(FindProcNode(FCompletingFirstEntryNode,NameAndParamsUpCase,[phpInUpperCase])<>nil);
|
||||
end;
|
||||
|
||||
procedure TCodeCompletionCodeTool.SetCodeCompleteClassNode(const AClassNode: TCodeTreeNode);
|
||||
@ -433,19 +440,19 @@ begin
|
||||
FJumpToProcName:='';
|
||||
FCodeCompleteClassNode:=AClassNode;
|
||||
if CodeCompleteClassNode=nil then begin
|
||||
FCompletingStartNode:=nil;
|
||||
FCompletingFirstEntryNode:=nil;
|
||||
exit;
|
||||
end;
|
||||
ClearIgnoreErrorAfter;
|
||||
// find first variable/method/GUID
|
||||
FCompletingStartNode:=GetFirstClassIdentifier(CodeCompleteClassNode);
|
||||
FCompletingFirstEntryNode:=GetFirstClassIdentifier(CodeCompleteClassNode);
|
||||
end;
|
||||
|
||||
procedure TCodeCompletionCodeTool.SetCodeCompleteSrcChgCache(
|
||||
const AValue: TSourceChangeCache);
|
||||
begin
|
||||
ASourceChangeCache:=AValue;
|
||||
ASourceChangeCache.MainScanner:=Scanner;
|
||||
FSourceChangeCache:=AValue;
|
||||
FSourceChangeCache.MainScanner:=Scanner;
|
||||
end;
|
||||
|
||||
function TCodeCompletionCodeTool.OnTopLvlIdentifierFound(
|
||||
@ -515,7 +522,7 @@ begin
|
||||
end;
|
||||
// ToDo: check ancestor vars too
|
||||
// search in current class
|
||||
Result:=(FindVarNode(FCompletingStartNode,UpperName)<>nil);
|
||||
Result:=(FindVarNode(FCompletingFirstEntryNode,UpperName)<>nil);
|
||||
end;
|
||||
|
||||
procedure TCodeCompletionCodeTool.AddClassInsertion(
|
||||
@ -562,7 +569,7 @@ begin
|
||||
FirstInsert:=NewInsert;
|
||||
exit;
|
||||
end;
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
if Beauty.ClassPartInsertPolicy=cpipLast then
|
||||
begin
|
||||
// add as last to inserts
|
||||
@ -1229,7 +1236,7 @@ begin
|
||||
RaiseException(ctsErrorDuringInsertingNewClassParts);
|
||||
|
||||
// insert all missing proc bodies
|
||||
if not CreateMissingProcBodies then
|
||||
if not CreateMissingClassProcBodies(false) then
|
||||
RaiseException(ctsErrorDuringCreationOfNewProcBodies);
|
||||
end;
|
||||
|
||||
@ -1437,9 +1444,14 @@ function TCodeCompletionCodeTool.CompleteForwardProcs(
|
||||
var NewPos: TCodeXYPosition; var NewTopLine: integer;
|
||||
SourceChangeCache: TSourceChangeCache): boolean;
|
||||
// add proc bodies for forward procs
|
||||
// or update signatures
|
||||
const
|
||||
ProcAttrDefToBody = [phpWithStart,
|
||||
phpWithVarModifiers,
|
||||
phpWithParameterNames,phpWithResultType,phpWithCallingSpecs];
|
||||
var
|
||||
RevertableJump: boolean;
|
||||
ProcBodyNodes: TAVLTree;
|
||||
ProcDefNodes, ProcBodyNodes: TAVLTree;
|
||||
StartProcNode: TCodeTreeNode;
|
||||
CurProcNode: TCodeTreeNode;
|
||||
EndProcNode: TCodeTreeNode;
|
||||
@ -1447,22 +1459,62 @@ var
|
||||
Indent: integer;
|
||||
InsertPos: integer;
|
||||
Beauty: TBeautifyCodeOptions;
|
||||
NodeExt: TCodeTreeNodeExtension;
|
||||
ProcsCopied: boolean;
|
||||
StartNode: TCodeTreeNode;
|
||||
OnlyNode: TCodeTreeNode;
|
||||
begin
|
||||
Result:=true;
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CompleteCode in a forward procedure ... ');
|
||||
{$ENDIF}
|
||||
CheckWholeUnitParsed(CursorNode,ProcNode);
|
||||
// gather all proc bodies
|
||||
ProcBodyNodes:=GatherProcNodes(FindNextNodeOnSameLvl(ProcNode),
|
||||
[phpInUpperCase,phpIgnoreForwards,phpIgnoreMethods],'');
|
||||
|
||||
Beauty:=SourceChangeCache.BeautifyCodeOptions;
|
||||
|
||||
ProcDefNodes:=nil;
|
||||
ProcBodyNodes:=nil;
|
||||
try
|
||||
// gather all proc definitions
|
||||
StartNode:=nil;
|
||||
if (ProcNode.Parent.Desc=ctnImplementation)
|
||||
and (ProcNode.Parent.PriorBrother<>nil)
|
||||
and (ProcNode.Parent.PriorBrother.Desc=ctnInterface) then
|
||||
StartNode:=ProcNode.Parent.PriorBrother.FirstChild;
|
||||
if StartNode=nil then
|
||||
StartNode:=FindFirstNodeOnSameLvl(ProcNode);
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteForwardProcs StartNode=',StartNode.DescAsString,' at ',CleanPosToStr(StartNode.StartPos),'=',ExtractProcName(StartNode,[])]);
|
||||
ProcDefNodes:=GatherProcNodes(StartNode,
|
||||
[phpInUpperCase,phpIgnoreProcsWithBody,phpIgnoreMethods],'');
|
||||
// gather all proc bodies
|
||||
ProcBodyNodes:=GatherProcNodes(FindNextNodeOnSameLvl(ProcNode),
|
||||
[phpInUpperCase,phpIgnoreForwards,phpIgnoreMethods],'');
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteForwardProcs Defs=',ProcDefNodes.Count,' Bodies=',ProcBodyNodes.Count]);
|
||||
|
||||
// create mapping from proc defs to proc bodies
|
||||
GuessProcDefBodyMapping(ProcDefNodes,ProcBodyNodes,true,false);
|
||||
ProcCode:=ExtractProcHead(ProcNode,[phpInUpperCase]);
|
||||
NodeExt:=FindNodeExtInTree(ProcDefNodes,ProcCode);
|
||||
if (NodeExt<>nil) and (NodeExt.Data<>nil) then begin
|
||||
// proc has already a body => update signatures
|
||||
//debugln(['TCodeCompletionCodeTool.CompleteForwardProcs proc body already exists, updating signatures ...']);
|
||||
if Beauty.UpdateMultiProcSignatures then
|
||||
OnlyNode:=nil
|
||||
else
|
||||
OnlyNode:=ProcNode;
|
||||
if not UpdateProcBodySignatures(ProcDefNodes,ProcBodyNodes,
|
||||
ProcAttrDefToBody,ProcsCopied,OnlyNode) then exit;
|
||||
if not SourceChangeCache.Apply then
|
||||
RaiseException('CompleteForwardProcs: unable to apply changes');
|
||||
exit;
|
||||
end;
|
||||
|
||||
// find first forward proc without body
|
||||
StartProcNode:=ProcNode;
|
||||
CurProcNode:=StartProcNode;
|
||||
repeat
|
||||
ProcCode:=ExtractProcHead(CurProcNode,[phpInUpperCase]);
|
||||
if (FindNodeInTree(ProcBodyNodes,ProcCode)<>nil)
|
||||
if (FindNodeExtInTree(ProcBodyNodes,ProcCode)<>nil)
|
||||
or (ProcNodeHasSpecifier(CurProcNode,psEXTERNAL)) then begin
|
||||
// node is already completed
|
||||
if CurProcNode=ProcNode then begin
|
||||
@ -1478,29 +1530,24 @@ begin
|
||||
|
||||
// find last forward proc without body
|
||||
EndProcNode:=ProcNode;
|
||||
CurProcNode:=EndProcNode;
|
||||
repeat
|
||||
CurProcNode:=EndProcNode.NextBrother;
|
||||
while (CurProcNode<>nil) and (CurProcNode.Desc=ctnProcedure)
|
||||
and ((CurProcNode.SubDesc and ctnsForwardDeclaration)>0) do begin
|
||||
ProcCode:=ExtractProcHead(CurProcNode,[phpInUpperCase]);
|
||||
if (FindNodeInTree(ProcBodyNodes,ProcCode)<>nil)
|
||||
if (FindNodeExtInTree(ProcBodyNodes,ProcCode)<>nil)
|
||||
or (ProcNodeHasSpecifier(CurProcNode,psEXTERNAL)) then begin
|
||||
// node is already completed
|
||||
if CurProcNode=ProcNode then begin
|
||||
// cursor node is already completed -> stop completion
|
||||
exit;
|
||||
end;
|
||||
break;
|
||||
end;
|
||||
EndProcNode:=CurProcNode;
|
||||
CurProcNode:=CurProcNode.NextBrother;
|
||||
until (CurProcNode=nil) or (CurProcNode.Desc<>ctnProcedure)
|
||||
or ((CurProcNode.SubDesc and ctnsForwardDeclaration)=0);
|
||||
end;
|
||||
|
||||
// find a nice insert position
|
||||
FindInsertPositionForForwardProc(SourceChangeCache,StartProcNode,
|
||||
Indent,InsertPos);
|
||||
|
||||
// build nice procs
|
||||
Beauty:=SourceChangeCache.BeautifyCodeOptions;
|
||||
CurProcNode:=StartProcNode;
|
||||
repeat
|
||||
ProcCode:=ExtractProcHead(CurProcNode,[phpWithStart,
|
||||
@ -1531,6 +1578,7 @@ begin
|
||||
// reparse code and find jump point into new proc
|
||||
Result:=FindJumpPoint(CursorPos,NewPos,NewTopLine,RevertableJump);
|
||||
finally
|
||||
DisposeAVLTree(ProcDefNodes);
|
||||
DisposeAVLTree(ProcBodyNodes);
|
||||
end;
|
||||
end;
|
||||
@ -2454,7 +2502,7 @@ begin
|
||||
// the proc was not found by name+params
|
||||
// => guess
|
||||
ProcBodyNodes:=GatherClassProcBodies(CodeCompleteClassNode);
|
||||
GuessMethodDefBodyMapping(ClassProcs,ProcBodyNodes);
|
||||
GuessProcDefBodyMapping(ClassProcs,ProcBodyNodes,true,true);
|
||||
AVLNode:=ProcBodyNodes.FindLowest;
|
||||
NodeExt:=nil;
|
||||
while AVLNode<>nil do begin
|
||||
@ -5388,7 +5436,7 @@ var
|
||||
finally
|
||||
FreeListOfPFindContext(PublishedMethods);
|
||||
end;
|
||||
ClassProcs:=GatherProcNodes(FCompletingStartNode,
|
||||
ClassProcs:=GatherProcNodes(FCompletingFirstEntryNode,
|
||||
[phpInUpperCase,phpAddClassName],
|
||||
ExtractClassName(CodeCompleteClassNode,true));
|
||||
end;
|
||||
@ -6256,7 +6304,8 @@ begin
|
||||
if not InsertAllNewClassParts then
|
||||
RaiseException(ctsErrorDuringInsertingNewClassParts);
|
||||
// insert all missing proc bodies
|
||||
if AddMissingProcBodies and (not CreateMissingProcBodies) then
|
||||
if AddMissingProcBodies
|
||||
and (not CreateMissingClassProcBodies(true)) then
|
||||
RaiseException(ctsErrorDuringCreationOfNewProcBodies);
|
||||
// apply the changes
|
||||
if not CodeCompleteSrcChgCache.Apply then
|
||||
@ -6570,7 +6619,7 @@ var
|
||||
if Parts[ppReadWord].StartPos>0 then begin
|
||||
// 'read' keyword exists -> insert read identifier behind
|
||||
InsertPos:=Parts[ppReadWord].EndPos;
|
||||
ASourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
FSourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
AccessParam);
|
||||
end else begin
|
||||
// 'read' keyword does not exist -> insert behind index and type
|
||||
@ -6580,7 +6629,7 @@ var
|
||||
InsertPos:=Parts[ppIndexWord].EndPos
|
||||
else
|
||||
InsertPos:=Parts[ppType].EndPos;
|
||||
ASourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
FSourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
BeautifyCodeOpts.BeautifyKeyWord('read')+' '+AccessParam);
|
||||
end;
|
||||
end;
|
||||
@ -6706,7 +6755,7 @@ var
|
||||
if Parts[ppWriteWord].StartPos>0 then begin
|
||||
// 'write' keyword exists -> insert write identifier behind
|
||||
InsertPos:=Parts[ppWriteWord].EndPos;
|
||||
ASourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
FSourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
AccessParam);
|
||||
end else begin
|
||||
// 'write' keyword does not exist
|
||||
@ -6721,7 +6770,7 @@ var
|
||||
InsertPos:=Parts[ppIndexWord].EndPos
|
||||
else
|
||||
InsertPos:=Parts[ppType].EndPos;
|
||||
ASourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
FSourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
BeautifyCodeOpts.BeautifyKeyWord('write')+' '+AccessParam);
|
||||
end;
|
||||
end;
|
||||
@ -6888,7 +6937,7 @@ var
|
||||
// insert stored specifier
|
||||
InsertPos:=Parts[ppStoredWord].EndPos;
|
||||
if CompleteProperties then
|
||||
ASourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
FSourceChangeCache.Replace(gtSpace,gtNone,InsertPos,InsertPos,
|
||||
AccessParam);
|
||||
end;
|
||||
end;
|
||||
@ -6898,7 +6947,7 @@ var
|
||||
if (PropNode.EndPos<=SrcLen) and (Src[PropNode.EndPos-1]<>';') then begin
|
||||
InsertPos:=PropNode.EndPos;
|
||||
if CompleteProperties then
|
||||
ASourceChangeCache.Replace(gtNone,gtNone,InsertPos,InsertPos,';');
|
||||
FSourceChangeCache.Replace(gtNone,gtNone,InsertPos,InsertPos,';');
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -6939,7 +6988,7 @@ begin
|
||||
Parts[ppUnitType].EndPos-Parts[ppUnitType].StartPos)+'.'+PropType;
|
||||
|
||||
// complete property
|
||||
BeautifyCodeOpts:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
BeautifyCodeOpts:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
if CodeCompleteClassNode.Desc <> ctnDispinterface then begin
|
||||
if Parts[ppIndex].StartPos>0 then
|
||||
ResolveIndexType;
|
||||
@ -6977,7 +7026,7 @@ var ANodeExt: TCodeTreeNodeExtension;
|
||||
begin
|
||||
ANodeExt:=FirstInsert;
|
||||
Visibility:=NewClassPartVisibility[PartType];
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
// insert all nodes of specific type
|
||||
while ANodeExt<>nil do begin
|
||||
IsVariable:=NodeExtIsVariable(ANodeExt);
|
||||
@ -7075,7 +7124,7 @@ begin
|
||||
|
||||
ctnProperty:
|
||||
begin
|
||||
if ASourceChangeCache.BeautifyCodeOptions
|
||||
if FSourceChangeCache.BeautifyCodeOptions
|
||||
.MixMethodsAndProperties then
|
||||
begin
|
||||
CurCode:=ExtractPropName(ANode,false);
|
||||
@ -7190,7 +7239,7 @@ begin
|
||||
DebugLn('TCodeCompletionCodeTool.InsertNewClassParts:');
|
||||
DebugLn(CurCode);
|
||||
{$ENDIF}
|
||||
ASourceChangeCache.Replace(gtNewLine,gtNewLine,InsertPos,InsertPos,
|
||||
FSourceChangeCache.Replace(gtNewLine,gtNewLine,InsertPos,InsertPos,
|
||||
CurCode);
|
||||
if (not IsVariable) and (Beauty.MethodInsertPolicy=mipClassOrder) then
|
||||
begin
|
||||
@ -7294,7 +7343,7 @@ var
|
||||
the first published section. But if a variable is already
|
||||
needed in the first published section, then the new section
|
||||
must be inserted in front of all }
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
FirstVisibilitySection:=GetFirstVisibilitySectionNode;
|
||||
if (TopMostPositionNode<>nil)
|
||||
and (FirstVisibilitySection<>nil)
|
||||
@ -7341,7 +7390,7 @@ var
|
||||
end;
|
||||
SectionKeyWord:=PascalClassSectionKeywords[Visibility];
|
||||
NewCode:=Beauty.BeautifyKeyWord(SectionKeyWord);
|
||||
ASourceChangeCache.Replace(gtNewLine,gtNewLine,
|
||||
FSourceChangeCache.Replace(gtNewLine,gtNewLine,
|
||||
NewClassSectionInsertPos[Visibility],
|
||||
NewClassSectionInsertPos[Visibility],
|
||||
Beauty.GetIndentStr(NewClassSectionIndent[Visibility])+NewCode);
|
||||
@ -7358,7 +7407,7 @@ begin
|
||||
Result:=true;
|
||||
exit;
|
||||
end;
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
|
||||
NewSectionKeyWordNeeded:=false;// 'published'/'public' keyword after first private section needed
|
||||
if CodeCompleteClassNode.Desc = ctnClass then
|
||||
@ -7375,7 +7424,7 @@ begin
|
||||
InsertNewClassParts(ncpProtectedProcs);
|
||||
|
||||
if NewSectionKeyWordNeeded and (NewSection = pcsPublic) then begin
|
||||
ASourceChangeCache.Replace(gtNewLine,gtNewLine,
|
||||
FSourceChangeCache.Replace(gtNewLine,gtNewLine,
|
||||
NewClassSectionInsertPos[NewSection],
|
||||
NewClassSectionInsertPos[NewSection],
|
||||
Beauty.GetIndentStr(NewClassSectionIndent[NewSection])+
|
||||
@ -7387,7 +7436,7 @@ begin
|
||||
InsertNewClassParts(ncpPublicProcs);
|
||||
|
||||
if NewSectionKeyWordNeeded and (NewSection = pcsPublished) then begin
|
||||
ASourceChangeCache.Replace(gtNewLine,gtNewLine,
|
||||
FSourceChangeCache.Replace(gtNewLine,gtNewLine,
|
||||
NewClassSectionInsertPos[NewSection],
|
||||
NewClassSectionInsertPos[NewSection],
|
||||
Beauty.GetIndentStr(NewClassSectionIndent[NewSection])+
|
||||
@ -7410,7 +7459,7 @@ var
|
||||
Beauty: TBeautifyCodeOptions;
|
||||
begin
|
||||
Result:=true;
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
if not Beauty.ClassHeaderComments then exit;
|
||||
// check if there is already a comment in front of the class
|
||||
|
||||
@ -7439,7 +7488,7 @@ begin
|
||||
InsertPos:=ClassIdentifierNode.StartPos;
|
||||
Indent:=Beauty.GetLineIndent(Src,InsertPos);
|
||||
Code:=Beauty.GetIndentStr(Indent)+'{ '+Code+' }';
|
||||
ASourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,
|
||||
FSourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,
|
||||
InsertPos,InsertPos,Code);
|
||||
end;
|
||||
|
||||
@ -7449,7 +7498,7 @@ var
|
||||
ProcCode: String;
|
||||
begin
|
||||
Result:=false;
|
||||
ANode:=FCompletingStartNode;
|
||||
ANode:=FCompletingFirstEntryNode;
|
||||
while (ANode<>nil) do begin
|
||||
if ANode.Desc=ctnProcedure then begin
|
||||
if ANode.FirstChild=nil then begin
|
||||
@ -7466,7 +7515,7 @@ begin
|
||||
{$IFDEF VerboseCompletionAdds}
|
||||
debugln(['TCodeCompletionCodeTool.InsertMissingClassSemicolons add missing semicolon at end of procedure head ProcCode="',dbgstr(ProcCode),'"']);
|
||||
{$ENDIF}
|
||||
if not ASourceChangeCache.Replace(gtNone,gtNone,
|
||||
if not FSourceChangeCache.Replace(gtNone,gtNone,
|
||||
CurPos.EndPos,CurPos.EndPos,';') then
|
||||
RaiseException('InsertMissingClassSemicolons: unable to insert semicolon');
|
||||
end;
|
||||
@ -7479,7 +7528,7 @@ begin
|
||||
{$IFDEF VerboseCompletionAdds}
|
||||
debugln(['TCodeCompletionCodeTool.InsertMissingClassSemicolons add missing semicolon in front of proc modifiers ProcCode="',dbgstr(ProcCode),'"']);
|
||||
{$ENDIF}
|
||||
if not ASourceChangeCache.Replace(gtNone,gtNone,
|
||||
if not FSourceChangeCache.Replace(gtNone,gtNone,
|
||||
CurPos.EndPos,CurPos.EndPos,';') then
|
||||
RaiseException('InsertMissingClassSemicolons: unable to insert semicolon');
|
||||
end;
|
||||
@ -7551,7 +7600,7 @@ begin
|
||||
MoveCursorToNodeStart(UsesNode); // for nice error position
|
||||
InsertPos:=UsesNode.EndPos-1; // position of semicolon at end of uses section
|
||||
NewUsesTerm:=', '+NewUsesTerm;
|
||||
if not ASourceChangeCache.Replace(gtNone,gtNone,InsertPos,InsertPos,
|
||||
if not FSourceChangeCache.Replace(gtNone,gtNone,InsertPos,InsertPos,
|
||||
NewUsesTerm) then exit;
|
||||
end else begin
|
||||
// create a new uses section
|
||||
@ -7567,9 +7616,9 @@ begin
|
||||
ReadNextAtom;
|
||||
end;
|
||||
InsertPos:=CurPos.EndPos;
|
||||
NewUsesTerm:=ASourceChangeCache.BeautifyCodeOptions.BeautifyKeyWord('uses')
|
||||
NewUsesTerm:=FSourceChangeCache.BeautifyCodeOptions.BeautifyKeyWord('uses')
|
||||
+' '+NewUsesTerm+';';
|
||||
if not ASourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,
|
||||
if not FSourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,
|
||||
InsertPos,InsertPos,NewUsesTerm) then exit;
|
||||
end;
|
||||
end;
|
||||
@ -7596,11 +7645,11 @@ begin
|
||||
DebugLn('[TCodeCompletionCodeTool.AddNewPropertyAccessMethodsToClassProcs]');
|
||||
{$ENDIF}
|
||||
// add new property access methods to ClassProcs
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
ANodeExt:=FirstInsert;
|
||||
while ANodeExt<>nil do begin
|
||||
if not NodeExtIsVariable(ANodeExt) then begin
|
||||
if FindNodeInTree(ClassProcs,ANodeExt.Txt)=nil then begin
|
||||
if FindNodeExtInTree(ClassProcs,ANodeExt.Txt)=nil then begin
|
||||
NewNodeExt:=TCodeTreeNodeExtension.Create;
|
||||
with NewNodeExt do begin
|
||||
Txt:=UpperCaseStr(TheClassName)+'.'+ANodeExt.Txt; // Name+ParamTypeList
|
||||
@ -7621,6 +7670,48 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
function TCodeCompletionCodeTool.UpdateProcBodySignature(
|
||||
ProcBodyNodes: TAVLTree; const BodyNodeExt: TCodeTreeNodeExtension;
|
||||
ProcAttrCopyDefToBody: TProcHeadAttributes; var ProcsCopied: boolean
|
||||
): boolean;
|
||||
var
|
||||
OldProcCode: String;
|
||||
NewProcCode: String;
|
||||
InsertEndPos: LongInt;
|
||||
BodyProcHeadNode: TCodeTreeNode;
|
||||
Indent: LongInt;
|
||||
InsertPos: LongInt;
|
||||
DefNodeExt: TCodeTreeNodeExtension;
|
||||
Beauty: TBeautifyCodeOptions;
|
||||
begin
|
||||
Result:=true;
|
||||
DefNodeExt:=TCodeTreeNodeExtension(BodyNodeExt.Data);
|
||||
if DefNodeExt=nil then exit;
|
||||
// this body has a definition
|
||||
// compare body and definition
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
NewProcCode:=ExtractProcHead(DefNodeExt.Node, ProcAttrCopyDefToBody);
|
||||
BodyProcHeadNode:=BodyNodeExt.Node.FirstChild;
|
||||
InsertPos:=BodyNodeExt.Node.StartPos;
|
||||
InsertEndPos:=BodyProcHeadNode.EndPos;
|
||||
Indent:=Beauty.GetLineIndent(Src, InsertPos);
|
||||
NewProcCode:=Beauty.BeautifyProc(NewProcCode, Indent, false);
|
||||
OldProcCode:=ExtractProcHead(BodyNodeExt.Node, ProcAttrCopyDefToBody);
|
||||
if CompareTextIgnoringSpace(NewProcCode, OldProcCode, true)<>0 then begin
|
||||
// update body
|
||||
//debugln(['TCodeCompletionCodeTool.UpdateProcBodySignatures Old="',dbgstr(OldProcCode),'" New="',dbgstr(NewProcCode),'"']);
|
||||
ProcsCopied:=true;
|
||||
if not FSourceChangeCache.Replace(gtNone, gtNone, InsertPos,
|
||||
InsertEndPos, NewProcCode) then
|
||||
exit(false);
|
||||
end;
|
||||
// update body signature in tree,
|
||||
// so that no new body is created for this definition
|
||||
ProcBodyNodes.RemovePointer(BodyNodeExt);
|
||||
BodyNodeExt.Txt:=DefNodeExt.Txt;
|
||||
ProcBodyNodes.Add(BodyNodeExt);
|
||||
end;
|
||||
|
||||
procedure TCodeCompletionCodeTool.CheckForOverrideAndAddInheritedCode(
|
||||
ANodeExt: TCodeTreeNodeExtension; Indent: integer);
|
||||
// check for 'override' directive and add 'inherited' code to body
|
||||
@ -7637,7 +7728,7 @@ begin
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('[TCodeCompletionCodeTool.CheckForOverrideAndAddInheritedCode]');
|
||||
{$ENDIF}
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
ProcNode:=ANodeExt.Node;
|
||||
if (ProcNode=nil) and (ANodeExt.ExtTxt3<>'') then Exit;
|
||||
InclProcCall:=False;
|
||||
@ -7686,81 +7777,57 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
function TCodeCompletionCodeTool.UpdateProcBodySignatures(ClassProcs,
|
||||
function TCodeCompletionCodeTool.UpdateProcBodySignatures(ProcDefNodes,
|
||||
ProcBodyNodes: TAVLTree; ProcAttrCopyDefToBody: TProcHeadAttributes; out
|
||||
ProcsCopied: boolean): boolean;
|
||||
{ ClassProcs and ProcBodyNodes were created by GatherProcNodes
|
||||
ProcsCopied: boolean; OnlyNode: TCodeTreeNode): boolean;
|
||||
{ ProcDefNodes and ProcBodyNodes were created by GatherProcNodes
|
||||
trees of TCodeTreeNodeExtension sorted with CompareCodeTreeNodeExt
|
||||
NodexExt.Data has mapping to ProcBodyNodes extensions, see GuessMethodDefBodyMapping
|
||||
|
||||
Node.Desc = ctnProcedure
|
||||
Node.Txt = ExtractProcHead(Node,SomeAttributes)
|
||||
}
|
||||
var
|
||||
BodyAVLNode: TAVLTreeNode;
|
||||
BodyNodeExt: TCodeTreeNodeExtension;
|
||||
DefNodeExt: TCodeTreeNodeExtension;
|
||||
InsertPos: LongInt;
|
||||
Indent: LongInt;
|
||||
BodyProcHeadNode: TCodeTreeNode;
|
||||
InsertEndPos: LongInt;
|
||||
NewProcCode: String;
|
||||
OldProcCode: String;
|
||||
Bodies: TFPList;
|
||||
i: Integer;
|
||||
Beauty: TBeautifyCodeOptions;
|
||||
DefNodeExt: TCodeTreeNodeExtension;
|
||||
begin
|
||||
Result:=true;
|
||||
ProcsCopied:=false;
|
||||
Bodies:=nil;
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
try
|
||||
// create a mapping in ClassProcs Data to ProcBodyNodes
|
||||
GuessMethodDefBodyMapping(ClassProcs,ProcBodyNodes);
|
||||
|
||||
// replace body proc head(s) with class proc head(s)
|
||||
// replace body proc head(s) with def proc head(s)
|
||||
Bodies:=TFPList.Create;
|
||||
BodyAVLNode:=ProcBodyNodes.FindLowest;
|
||||
while BodyAVLNode<>nil do begin
|
||||
Bodies.Add(BodyAVLNode.Data);
|
||||
BodyNodeExt:=TCodeTreeNodeExtension(BodyAVLNode.Data);
|
||||
BodyAVLNode:=ProcBodyNodes.FindSuccessor(BodyAVLNode);
|
||||
DefNodeExt:=TCodeTreeNodeExtension(BodyNodeExt.Data);
|
||||
if DefNodeExt=nil then continue;
|
||||
if (OnlyNode=nil) or (OnlyNode=DefNodeExt.Node)
|
||||
or (OnlyNode.HasAsParent(DefNodeExt.Node)) then
|
||||
Bodies.Add(BodyNodeExt);
|
||||
end;
|
||||
for i:=0 to Bodies.Count-1 do begin
|
||||
BodyNodeExt:=TCodeTreeNodeExtension(Bodies[i]);
|
||||
DefNodeExt:=TCodeTreeNodeExtension(BodyNodeExt.Data);
|
||||
if DefNodeExt<>nil then begin
|
||||
// this body has a definition
|
||||
// compare body and definition
|
||||
NewProcCode:=ExtractProcHead(DefNodeExt.Node,ProcAttrCopyDefToBody);
|
||||
BodyProcHeadNode:=BodyNodeExt.Node.FirstChild;
|
||||
InsertPos:=BodyNodeExt.Node.StartPos;
|
||||
InsertEndPos:=BodyProcHeadNode.EndPos;
|
||||
Indent:=Beauty.GetLineIndent(Src,InsertPos);
|
||||
NewProcCode:=Beauty.BeautifyProc(NewProcCode,Indent,false);
|
||||
OldProcCode:=ExtractProcHead(BodyNodeExt.Node,ProcAttrCopyDefToBody);
|
||||
if CompareTextIgnoringSpace(NewProcCode,OldProcCode,true)<>0 then begin
|
||||
// update body
|
||||
//debugln(['TCodeCompletionCodeTool.UpdateProcBodySignatures Old="',dbgstr(OldProcCode),'" New="',dbgstr(NewProcCode),'"']);
|
||||
ProcsCopied:=true;
|
||||
if not ASourceChangeCache.Replace(gtNone,gtNone,InsertPos,InsertEndPos,NewProcCode) then
|
||||
exit(false);
|
||||
end;
|
||||
// change body signature as exactly the same as definition,
|
||||
// so that no new body is created for this definition
|
||||
ProcBodyNodes.RemovePointer(BodyNodeExt);
|
||||
BodyNodeExt.Txt:=DefNodeExt.Txt;
|
||||
ProcBodyNodes.Add(BodyNodeExt);
|
||||
end;
|
||||
if not UpdateProcBodySignature(ProcBodyNodes, BodyNodeExt,
|
||||
ProcAttrCopyDefToBody, ProcsCopied)
|
||||
then
|
||||
exit(false);
|
||||
end;
|
||||
finally
|
||||
FreeAndNil(Bodies);
|
||||
ClearNodeExtData(ProcBodyNodes);
|
||||
ClearNodeExtData(ClassProcs);
|
||||
ClearNodeExtData(ProcDefNodes);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCodeCompletionCodeTool.GuessMethodDefBodyMapping(ClassProcs,
|
||||
ProcBodyNodes: TAVLTree);
|
||||
{ ClassProcs and ProcBodyNodes are trees of TCodeTreeNodeExtension
|
||||
ClassProcs Data points to mapped ProcBodyNodes nodes
|
||||
procedure TCodeCompletionCodeTool.GuessProcDefBodyMapping(ProcDefNodes,
|
||||
ProcBodyNodes: TAVLTree; MapByNameOnly, MapLastOne: boolean);
|
||||
{ ProcDefNodes and ProcBodyNodes are trees of TCodeTreeNodeExtension
|
||||
ProcDefNodes Data points to mapped ProcBodyNodes nodes
|
||||
}
|
||||
|
||||
procedure MapBodiesAndDefsByNameAndParams;
|
||||
@ -7773,7 +7840,7 @@ procedure TCodeCompletionCodeTool.GuessMethodDefBodyMapping(ClassProcs,
|
||||
while BodyAVLNode<>nil do begin
|
||||
BodyNodeExt:=TCodeTreeNodeExtension(BodyAVLNode.Data);
|
||||
if BodyNodeExt.Data=nil then begin
|
||||
DefAVLNode:=ClassProcs.Find(BodyNodeExt);
|
||||
DefAVLNode:=ProcDefNodes.Find(BodyNodeExt);
|
||||
if DefAVLNode<>nil then begin
|
||||
// exact match => connect
|
||||
BodyNodeExt.Data:=DefAVLNode.Data;
|
||||
@ -7840,7 +7907,7 @@ procedure TCodeCompletionCodeTool.GuessMethodDefBodyMapping(ClassProcs,
|
||||
BodyNodesByName:=CreateNameTree(ProcBodyNodes,true);
|
||||
if BodyNodesByName=nil then exit;
|
||||
// ... and one for the definitions
|
||||
DefNodesByName:=CreateNameTree(ClassProcs,true);
|
||||
DefNodesByName:=CreateNameTree(ProcDefNodes,true);
|
||||
if DefNodesByName=nil then exit;
|
||||
// check each body if it can be mapped bijective by name
|
||||
BodyAVLNode:=BodyNodesByName.FindLowest;
|
||||
@ -7929,7 +7996,7 @@ procedure TCodeCompletionCodeTool.GuessMethodDefBodyMapping(ClassProcs,
|
||||
BodyNodeExt:=GetNodeExtWithoutData(ProcBodyNodes,Cnt);
|
||||
if Cnt>1 then debugln(['Note: TCodeCompletionCodeTool.UpdateProcBodySignatures.MapLastBodyAndDef multiple bodies which can not be mapped to definitions']);
|
||||
if Cnt<>1 then exit;
|
||||
DefNodeExt:=GetNodeExtWithoutData(ClassProcs,Cnt);
|
||||
DefNodeExt:=GetNodeExtWithoutData(ProcDefNodes,Cnt);
|
||||
if Cnt>1 then debugln(['Note: TCodeCompletionCodeTool.UpdateProcBodySignatures.MapLastBodyAndDef multiple definitions which can not be mapped to bodies']);
|
||||
if Cnt<>1 then exit;
|
||||
BodyNodeExt.Data:=DefNodeExt;
|
||||
@ -7938,10 +8005,12 @@ procedure TCodeCompletionCodeTool.GuessMethodDefBodyMapping(ClassProcs,
|
||||
|
||||
begin
|
||||
ClearNodeExtData(ProcBodyNodes);
|
||||
ClearNodeExtData(ClassProcs);
|
||||
ClearNodeExtData(ProcDefNodes);
|
||||
MapBodiesAndDefsByNameAndParams; // first: map all exact matches between bodies and defs
|
||||
MapBodiesAndDefsByName; // second: map remaining by name without params
|
||||
MapLastBodyAndDef; // last: map if there is exactly one unmatching body and def
|
||||
if MapByNameOnly then
|
||||
MapBodiesAndDefsByName; // second: map remaining by name without params
|
||||
if MapLastOne then
|
||||
MapLastBodyAndDef; // last: map if there is exactly one unmatching body and def
|
||||
end;
|
||||
|
||||
function TCodeCompletionCodeTool.GatherClassProcDefinitions(
|
||||
@ -7981,7 +8050,8 @@ begin
|
||||
ExtractClassName(ClassNode,true));
|
||||
end;
|
||||
|
||||
function TCodeCompletionCodeTool.CreateMissingProcBodies: boolean;
|
||||
function TCodeCompletionCodeTool.CreateMissingClassProcBodies(
|
||||
UpdateSignatures: boolean): boolean;
|
||||
const
|
||||
ProcAttrDefToBody = [phpWithStart,
|
||||
phpAddClassname,phpWithVarModifiers,
|
||||
@ -8000,10 +8070,10 @@ var
|
||||
ProcCode:=ANodeExt.ExtTxt1;
|
||||
ProcCode:=Beauty.AddClassAndNameToProc(ProcCode,TheClassName,'');
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('CreateMissingProcBodies InsertProcBody ',TheClassName,' "',ProcCode,'"');
|
||||
DebugLn('CreateMissingClassProcBodies InsertProcBody ',TheClassName,' "',ProcCode,'"');
|
||||
{$ENDIF}
|
||||
ProcCode:=Beauty.BeautifyProc(ProcCode,Indent,ANodeExt.ExtTxt3='');
|
||||
ASourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,ProcCode);
|
||||
FSourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,ProcCode);
|
||||
if FJumpToProcName='' then begin
|
||||
// remember one proc body to jump to after the completion
|
||||
FJumpToProcName:=ANodeExt.Txt;
|
||||
@ -8012,7 +8082,7 @@ var
|
||||
if FJumpToProcName[length(FJumpToProcName)]<>';' then
|
||||
FJumpToProcName:=FJumpToProcName+';';
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('CreateMissingProcBodies FJumpToProcName="',FJumpToProcName,'"');
|
||||
DebugLn('CreateMissingClassProcBodies FJumpToProcName="',FJumpToProcName,'"');
|
||||
{$ENDIF}
|
||||
end;
|
||||
end;
|
||||
@ -8209,7 +8279,7 @@ var
|
||||
exit;
|
||||
end;
|
||||
|
||||
RaiseException('TCodeCompletionCodeTool.CreateMissingProcBodies.FindInsertPointForNewClass '
|
||||
RaiseException('TCodeCompletionCodeTool.CreateMissingClassProcBodies.FindInsertPointForNewClass '
|
||||
+' Internal Error: no insert position found');
|
||||
end;
|
||||
|
||||
@ -8231,7 +8301,7 @@ var
|
||||
end;
|
||||
ClassStartComment:=Beauty.GetIndentStr(Indent)
|
||||
+'{ '+ExtractClassName(CodeCompleteClassNode,false)+' }';
|
||||
ASourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,
|
||||
FSourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,
|
||||
ClassStartComment);
|
||||
end;
|
||||
|
||||
@ -8239,28 +8309,29 @@ var
|
||||
InsertPos: integer;
|
||||
Indent: integer;
|
||||
ProcsCopied: boolean;
|
||||
OnlyNode: TCodeTreeNode;
|
||||
begin
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingProcBodies Gather existing method bodies ... ');
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingClassProcBodies Gather existing method bodies ... ');
|
||||
{$ENDIF}
|
||||
if CodeCompleteClassNode.Desc in AllClassInterfaces then begin
|
||||
// interfaces have no implementations
|
||||
{$IFDEF CTDEBUG}
|
||||
debugln(['TCodeCompletionCodeTool.CreateMissingProcBodies interface ',CodeCompleteClassNode.DescAsString]);
|
||||
debugln(['TCodeCompletionCodeTool.CreateMissingClassProcBodies interface ',CodeCompleteClassNode.DescAsString]);
|
||||
{$ENDIF}
|
||||
exit(true);
|
||||
end;
|
||||
|
||||
Result:=false;
|
||||
Beauty:=ASourceChangeCache.BeautifyCodeOptions;
|
||||
Beauty:=FSourceChangeCache.BeautifyCodeOptions;
|
||||
MethodInsertPolicy:=Beauty.MethodInsertPolicy;
|
||||
// gather existing class proc bodies
|
||||
ClassProcs:=nil;
|
||||
ProcBodyNodes:=nil;
|
||||
try
|
||||
//debugln(['TCodeCompletionCodeTool.CreateMissingProcBodies get class procs of ',CodeCompleteClassNode.DescAsString]);
|
||||
//debugln(['TCodeCompletionCodeTool.CreateMissingClassProcBodies get class procs of ',CodeCompleteClassNode.DescAsString]);
|
||||
ClassProcs:=GatherClassProcDefinitions(CodeCompleteClassNode,true);
|
||||
//debugln(['TCodeCompletionCodeTool.CreateMissingProcBodies get bodies of ',CodeCompleteClassNode.DescAsString]);
|
||||
//debugln(['TCodeCompletionCodeTool.CreateMissingClassProcBodies get bodies of ',CodeCompleteClassNode.DescAsString]);
|
||||
ProcBodyNodes:=GatherClassProcBodies(CodeCompleteClassNode);
|
||||
|
||||
{AnAVLNode:=ClassProcs.FindLowest;
|
||||
@ -8278,7 +8349,7 @@ begin
|
||||
FindTopMostAndBottomMostProcBodies;
|
||||
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingProcBodies Gather existing method declarations ... ');
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingClassProcBodies Gather existing method declarations ... ');
|
||||
{$ENDIF}
|
||||
TheClassName:=ExtractClassName(CodeCompleteClassNode,false);
|
||||
|
||||
@ -8286,9 +8357,16 @@ begin
|
||||
CheckForDoubleDefinedMethods;
|
||||
|
||||
// check for changed procs
|
||||
if not UpdateProcBodySignatures(ClassProcs,ProcBodyNodes,ProcAttrDefToBody,
|
||||
ProcsCopied)
|
||||
then exit;
|
||||
if UpdateSignatures then begin
|
||||
GuessProcDefBodyMapping(ClassProcs,ProcBodyNodes,true,true);
|
||||
if Beauty.UpdateAllMethodSignatures then
|
||||
OnlyNode:=nil
|
||||
else
|
||||
OnlyNode:=FCompletingCursorNode;
|
||||
if not UpdateProcBodySignatures(ClassProcs,ProcBodyNodes,ProcAttrDefToBody,
|
||||
ProcsCopied,OnlyNode)
|
||||
then exit;
|
||||
end;
|
||||
|
||||
// there are new methods
|
||||
|
||||
@ -8344,10 +8422,10 @@ begin
|
||||
if (ProcBodyNodes.Count=0) then begin
|
||||
// there were no old proc bodies of the class -> start class
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingProcBodies Starting class in implementation ');
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingClassProcBodies Starting class in implementation ');
|
||||
{$ENDIF}
|
||||
FindInsertPointForNewClass(InsertPos,Indent);
|
||||
//debugln(['TCodeCompletionCodeTool.CreateMissingProcBodies Indent=',Indent,' InsertPos=',dbgstr(copy(Src,InsertPos-10,10)),'|',dbgstr(copy(Src,InsertPos,10))]);
|
||||
//debugln(['TCodeCompletionCodeTool.CreateMissingClassProcBodies Indent=',Indent,' InsertPos=',dbgstr(copy(Src,InsertPos-10,10)),'|',dbgstr(copy(Src,InsertPos,10))]);
|
||||
InsertClassMethodsComment(InsertPos,Indent);
|
||||
|
||||
// insert all proc bodies
|
||||
@ -8364,7 +8442,7 @@ begin
|
||||
// -> search a good Insert Position behind or in front of
|
||||
// another proc body of this class
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingProcBodies Insert missing bodies between existing ... ClassProcs.Count=',dbgs(ClassProcs.Count));
|
||||
DebugLn('TCodeCompletionCodeTool.CreateMissingClassProcBodies Insert missing bodies between existing ... ClassProcs.Count=',dbgs(ClassProcs.Count));
|
||||
{$ENDIF}
|
||||
|
||||
// set default insert position
|
||||
@ -8377,9 +8455,9 @@ begin
|
||||
while (MissingNode<>nil) do begin
|
||||
ANodeExt:=TCodeTreeNodeExtension(MissingNode.Data);
|
||||
ExistingNode:=ProcBodyNodes.Find(MissingNode.Data);
|
||||
//DebugLn(['TCodeCompletionCodeTool.CreateMissingProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',ExistingNode<>nil]);
|
||||
//DebugLn(['TCodeCompletionCodeTool.CreateMissingClassProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',ExistingNode<>nil]);
|
||||
if ExistingNode=nil then begin
|
||||
//DebugLn(['TCodeCompletionCodeTool.CreateMissingProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',TCodeTreeNodeExtension(ExistingNode.Data).Txt]);
|
||||
//DebugLn(['TCodeCompletionCodeTool.CreateMissingClassProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',TCodeTreeNodeExtension(ExistingNode.Data).Txt]);
|
||||
// MissingNode does not have a body -> insert proc body
|
||||
case MethodInsertPolicy of
|
||||
mipAlphabetically:
|
||||
@ -8475,7 +8553,7 @@ begin
|
||||
RaiseException(ctsErrorDuringInsertingNewClassParts);
|
||||
|
||||
// create missing method bodies
|
||||
if AddMissingProcBodies and (not CreateMissingProcBodies) then
|
||||
if AddMissingProcBodies and (not CreateMissingClassProcBodies(true)) then
|
||||
RaiseException(ctsErrorDuringCreationOfNewProcBodies);
|
||||
|
||||
CurClassName:=ExtractClassName(CodeCompleteClassNode,false);
|
||||
@ -8485,7 +8563,7 @@ begin
|
||||
RaiseException('TCodeCompletionCodeTool.CompleteCode Internal Error CleanPosToCodePos');
|
||||
if not CleanPosToCaret(CleanPos,OldCodeXYPos) then
|
||||
RaiseException('TCodeCompletionCodeTool.CompleteCode Internal Error CleanPosToCaret');
|
||||
if not ASourceChangeCache.Apply then
|
||||
if not FSourceChangeCache.Apply then
|
||||
RaiseException(ctsUnableToApplyChanges);
|
||||
|
||||
finally
|
||||
@ -8566,66 +8644,71 @@ begin
|
||||
|
||||
CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true);
|
||||
CodeCompleteSrcChgCache:=SourceChangeCache;
|
||||
FCompletingCursorNode:=CursorNode;
|
||||
try
|
||||
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CompleteCode A CleanCursorPos=',dbgs(CleanCursorPos),' NodeDesc=',NodeDescriptionAsString(CursorNode.Desc));
|
||||
{$ENDIF}
|
||||
ImplementationNode:=FindImplementationNode;
|
||||
if ImplementationNode=nil then ImplementationNode:=Tree.Root;
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CompleteCode A CleanCursorPos=',dbgs(CleanCursorPos),' NodeDesc=',NodeDescriptionAsString(CursorNode.Desc));
|
||||
{$ENDIF}
|
||||
ImplementationNode:=FindImplementationNode;
|
||||
if ImplementationNode=nil then ImplementationNode:=Tree.Root;
|
||||
|
||||
// test if in a class
|
||||
AClassNode:=FindClassOrInterfaceNode(CursorNode);
|
||||
if AClassNode<>nil then begin
|
||||
Result:=CompleteClass(AClassNode,CleanCursorPos,OldTopLine,CursorNode,
|
||||
NewPos,NewTopLine);
|
||||
exit;
|
||||
// test if in a class
|
||||
AClassNode:=FindClassOrInterfaceNode(CursorNode);
|
||||
if AClassNode<>nil then begin
|
||||
Result:=CompleteClass(AClassNode,CleanCursorPos,OldTopLine,CursorNode,
|
||||
NewPos,NewTopLine);
|
||||
exit;
|
||||
end;
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CompleteCode not in-a-class ... ');
|
||||
{$ENDIF}
|
||||
|
||||
// test if forward proc
|
||||
//debugln('TCodeCompletionCodeTool.CompleteCode ',CursorNode.DescAsString);
|
||||
ProcNode:=CursorNode.GetNodeOfType(ctnProcedure);
|
||||
if (ProcNode=nil) and (CursorNode.Desc=ctnProcedure) then
|
||||
ProcNode:=CursorNode;
|
||||
if (ProcNode<>nil) and (ProcNode.Desc=ctnProcedure)
|
||||
and ((ProcNode.SubDesc and ctnsForwardDeclaration)>0) then begin
|
||||
// Node is forward Proc
|
||||
Result:=CompleteForwardProcs(CursorPos,ProcNode,CursorNode,NewPos,NewTopLine,
|
||||
SourceChangeCache);
|
||||
exit;
|
||||
end;
|
||||
|
||||
// test if Event assignment (MyClick:=@Button1.OnClick)
|
||||
Result:=CompleteEventAssignment(CleanCursorPos,OldTopLine,CursorNode,
|
||||
IsEventAssignment,NewPos,NewTopLine,SourceChangeCache);
|
||||
if IsEventAssignment then exit;
|
||||
|
||||
// test if Local variable assignment (i:=3)
|
||||
Result:=CompleteLocalVariableAssignment(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if Local variable iterator (for i in j)
|
||||
Result:=CompleteLocalVariableForIn(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if undeclared local variable as parameter (GetPenPos(x,y))
|
||||
Result:=CompleteLocalIdentifierByParameter(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if procedure call
|
||||
Result:=CompleteProcByCall(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if method body
|
||||
Result:=CompleteMethodByBody(OldCleanCursorPos,OldTopLine,CursorNode,
|
||||
NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
finally
|
||||
FCompletingCursorNode:=nil;
|
||||
end;
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CompleteCode not in-a-class ... ');
|
||||
{$ENDIF}
|
||||
|
||||
// test if forward proc
|
||||
//debugln('TCodeCompletionCodeTool.CompleteCode ',CursorNode.DescAsString);
|
||||
ProcNode:=CursorNode.GetNodeOfType(ctnProcedure);
|
||||
if (ProcNode=nil) and (CursorNode.Desc=ctnProcedure) then
|
||||
ProcNode:=CursorNode;
|
||||
if (ProcNode<>nil) and (ProcNode.Desc=ctnProcedure)
|
||||
and ((ProcNode.SubDesc and ctnsForwardDeclaration)>0) then begin
|
||||
// Node is forward Proc
|
||||
Result:=CompleteForwardProcs(CursorPos,ProcNode,CursorNode,NewPos,NewTopLine,
|
||||
SourceChangeCache);
|
||||
exit;
|
||||
end;
|
||||
|
||||
// test if Event assignment (MyClick:=@Button1.OnClick)
|
||||
Result:=CompleteEventAssignment(CleanCursorPos,OldTopLine,CursorNode,
|
||||
IsEventAssignment,NewPos,NewTopLine,SourceChangeCache);
|
||||
if IsEventAssignment then exit;
|
||||
|
||||
// test if Local variable assignment (i:=3)
|
||||
Result:=CompleteLocalVariableAssignment(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if Local variable iterator (for i in j)
|
||||
Result:=CompleteLocalVariableForIn(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if undeclared local variable as parameter (GetPenPos(x,y))
|
||||
Result:=CompleteLocalIdentifierByParameter(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if procedure call
|
||||
Result:=CompleteProcByCall(CleanCursorPos,OldTopLine,
|
||||
CursorNode,NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
// test if method body
|
||||
Result:=CompleteMethodByBody(OldCleanCursorPos,OldTopLine,CursorNode,
|
||||
NewPos,NewTopLine,SourceChangeCache);
|
||||
if Result then exit;
|
||||
|
||||
{$IFDEF CTDEBUG}
|
||||
DebugLn('TCodeCompletionCodeTool.CompleteCode nothing to complete ... ');
|
||||
|
||||
@ -1002,7 +1002,7 @@ begin
|
||||
{$ENDIF}
|
||||
if not InsertAllNewClassParts then
|
||||
RaiseException(ctsErrorDuringInsertingNewClassParts);
|
||||
if not CreateMissingProcBodies then
|
||||
if not CreateMissingClassProcBodies(false) then
|
||||
RaiseException(ctsErrorDuringCreationOfNewProcBodies);
|
||||
if not InsertAllNewUnitsToMainUsesSection then
|
||||
RaiseException(ctsErrorDuringInsertingNewUsesSection);
|
||||
|
||||
@ -952,7 +952,7 @@ var
|
||||
if ProcType in [eptPublishedMethod,eptPrivateMethod,eptProtectedMethod,
|
||||
eptPublicMethod] then
|
||||
begin
|
||||
if not CreateMissingProcBodies then
|
||||
if not CreateMissingClassProcBodies(false) then
|
||||
RaiseException(ctsErrorDuringCreationOfNewProcBodies);
|
||||
end else begin
|
||||
TabWidth:=Beauty.TabWidth;
|
||||
|
||||
@ -71,7 +71,7 @@ type
|
||||
function JumpToMethod(const ProcHead: string; Attr: TProcHeadAttributes;
|
||||
var NewPos: TCodeXYPosition; var NewTopLine: integer;
|
||||
IgnoreJumpCentered: boolean): boolean;
|
||||
function FindNodeInTree(ATree: TAVLTree;
|
||||
function FindNodeExtInTree(ATree: TAVLTree;
|
||||
const UpperCode: string): TCodeTreeNodeExtension;
|
||||
function CreateSubProcPath(StartNode: TCodeTreeNode;
|
||||
Attr: TProcHeadAttributes): TStringList;
|
||||
@ -913,7 +913,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
function TMethodJumpingCodeTool.FindNodeInTree(ATree: TAVLTree;
|
||||
function TMethodJumpingCodeTool.FindNodeExtInTree(ATree: TAVLTree;
|
||||
const UpperCode: string): TCodeTreeNodeExtension;
|
||||
var cmp: integer;
|
||||
ANode: TAVLTreeNode;
|
||||
|
||||
@ -148,6 +148,7 @@ type
|
||||
// procedures
|
||||
ForwardProcBodyInsertPolicy: TForwardProcBodyInsertPolicy;
|
||||
KeepForwardProcOrder: boolean;
|
||||
UpdateMultiProcSignatures: boolean;
|
||||
// classes, methods, properties
|
||||
ClassHeaderComments: boolean;
|
||||
ClassImplementationComments: boolean;
|
||||
@ -158,6 +159,7 @@ type
|
||||
PropertyWriteIdentPrefix: string;
|
||||
PropertyStoredIdentPostfix: string;
|
||||
PrivateVariablePrefix: string;
|
||||
UpdateAllMethodSignatures: boolean;
|
||||
// uses section
|
||||
UsesInsertPolicy: TUsesInsertPolicy;
|
||||
|
||||
@ -1248,6 +1250,8 @@ begin
|
||||
TabWidth:=8;
|
||||
ClassPartInsertPolicy:=cpipLast;
|
||||
MixMethodsAndProperties:=false;
|
||||
UpdateAllMethodSignatures:=true;
|
||||
UpdateMultiProcSignatures:=true;
|
||||
MethodInsertPolicy:=mipClassOrder;
|
||||
ForwardProcBodyInsertPolicy:=fpipBehindMethods;
|
||||
KeepForwardProcOrder:=true;
|
||||
|
||||
@ -81,6 +81,8 @@ type
|
||||
FMethodInsertPolicy: TMethodInsertPolicy;
|
||||
FKeyWordPolicy : TWordPolicy;
|
||||
FIdentifierPolicy: TWordPolicy;
|
||||
FUpdateAllMethodSignatures: boolean;
|
||||
FUpdateMultiProcSignatures: boolean;
|
||||
FWordPolicyExceptions: TStringList;
|
||||
FDoNotSplitLineInFront: TAtomTypes;
|
||||
FDoNotSplitLineAfter: TAtomTypes;
|
||||
@ -154,10 +156,14 @@ type
|
||||
read FClassPartInsertPolicy write FClassPartInsertPolicy;
|
||||
property MixMethodsAndProperties: boolean
|
||||
read FMixMethodsAndProperties write FMixMethodsAndProperties;
|
||||
property UpdateAllMethodSignatures: boolean
|
||||
read FUpdateAllMethodSignatures write FUpdateAllMethodSignatures;
|
||||
property ForwardProcBodyInsertPolicy: TForwardProcBodyInsertPolicy
|
||||
read FForwardProcBodyInsertPolicy write FForwardProcBodyInsertPolicy;
|
||||
property KeepForwardProcOrder: boolean
|
||||
read FKeepForwardProcOrder write FKeepForwardProcOrder;
|
||||
property UpdateMultiProcSignatures: boolean
|
||||
read FUpdateMultiProcSignatures write FUpdateMultiProcSignatures;
|
||||
property ClassHeaderComments: boolean
|
||||
read FClassHeaderComments write FClassHeaderComments;
|
||||
property ClassImplementationComments: boolean
|
||||
@ -400,11 +406,15 @@ begin
|
||||
ClassPartInsertPolicyNames[cpipAlphabetically]));
|
||||
FMixMethodsAndProperties:=XMLConfig.GetValue(
|
||||
'CodeToolsOptions/MixMethodsAndProperties/Value',false);
|
||||
FUpdateAllMethodSignatures:=XMLConfig.GetValue(
|
||||
'CodeToolsOptions/UpdateAllMethodSignatures/Value',true);
|
||||
FForwardProcBodyInsertPolicy:=ForwardProcBodyInsertPolicyNameToPolicy(
|
||||
XMLConfig.GetValue('CodeToolsOptions/ForwardProcBodyInsertPolicy/Value',
|
||||
ForwardProcBodyInsertPolicyNames[fpipInFrontOfMethods]));
|
||||
FKeepForwardProcOrder:=XMLConfig.GetValue(
|
||||
'CodeToolsOptions/KeepForwardProcOrder/Value',true);
|
||||
FUpdateMultiProcSignatures:=XMLConfig.GetValue(
|
||||
'CodeToolsOptions/UpdateMultiProcSignatures/Value',true);
|
||||
FClassHeaderComments:=XMLConfig.GetValue(
|
||||
'CodeToolsOptions/ClassHeaderComments/Value',true);
|
||||
FClassImplementationComments:=XMLConfig.GetValue(
|
||||
@ -530,6 +540,9 @@ begin
|
||||
XMLConfig.SetDeleteValue(
|
||||
'CodeToolsOptions/MixMethodsAndProperties/Value',FMixMethodsAndProperties,
|
||||
false);
|
||||
XMLConfig.SetDeleteValue(
|
||||
'CodeToolsOptions/UpdateAllMethodSignatures/Value',FUpdateAllMethodSignatures,
|
||||
true);
|
||||
XMLConfig.SetDeleteValue('CodeToolsOptions/ForwardProcBodyInsertPolicy/Value',
|
||||
ForwardProcBodyInsertPolicyNames[FForwardProcBodyInsertPolicy],
|
||||
ForwardProcBodyInsertPolicyNames[fpipInFrontOfMethods]);
|
||||
@ -537,6 +550,9 @@ begin
|
||||
'CodeToolsOptions/KeepForwardProcOrder/Value',FKeepForwardProcOrder,true);
|
||||
XMLConfig.SetDeleteValue(
|
||||
'CodeToolsOptions/ClassHeaderComments/Value',FClassHeaderComments,true);
|
||||
XMLConfig.SetDeleteValue(
|
||||
'CodeToolsOptions/UpdateMultiProcSignatures/Value',FUpdateMultiProcSignatures,
|
||||
true);
|
||||
XMLConfig.SetDeleteValue(
|
||||
'CodeToolsOptions/ClassImplementationComments/Value',
|
||||
FClassImplementationComments,true);
|
||||
@ -661,8 +677,10 @@ begin
|
||||
FLineLength:=CodeToolsOpts.FLineLength;
|
||||
FClassPartInsertPolicy:=CodeToolsOpts.FClassPartInsertPolicy;
|
||||
FMixMethodsAndProperties:=CodeToolsOpts.MixMethodsAndProperties;
|
||||
FUpdateAllMethodSignatures:=CodeToolsOpts.UpdateAllMethodSignatures;
|
||||
FForwardProcBodyInsertPolicy:=CodeToolsOpts.ForwardProcBodyInsertPolicy;
|
||||
FKeepForwardProcOrder:=CodeToolsOpts.KeepForwardProcOrder;
|
||||
FUpdateMultiProcSignatures:=CodeToolsOpts.UpdateMultiProcSignatures;
|
||||
FClassHeaderComments:=CodeToolsOpts.ClassHeaderComments;
|
||||
FClassImplementationComments:=CodeToolsOpts.ClassImplementationComments;
|
||||
FMethodInsertPolicy:=CodeToolsOpts.FMethodInsertPolicy;
|
||||
@ -713,8 +731,10 @@ begin
|
||||
FLineLength:=80;
|
||||
FClassPartInsertPolicy:=cpipLast;
|
||||
FMixMethodsAndProperties:=false;
|
||||
FUpdateAllMethodSignatures:=true;
|
||||
FForwardProcBodyInsertPolicy:=fpipInFrontOfMethods;
|
||||
FKeepForwardProcOrder:=true;
|
||||
FUpdateMultiProcSignatures:=true;
|
||||
FClassHeaderComments:=true;
|
||||
FClassImplementationComments:=true;
|
||||
FMethodInsertPolicy:=mipClassOrder;
|
||||
@ -780,8 +800,10 @@ begin
|
||||
and (FLineLength=CodeToolsOpts.FLineLength)
|
||||
and (FClassPartInsertPolicy=CodeToolsOpts.FClassPartInsertPolicy)
|
||||
and (FMixMethodsAndProperties=CodeToolsOpts.MixMethodsAndProperties)
|
||||
and (FUpdateAllMethodSignatures=CodeToolsOpts.UpdateAllMethodSignatures)
|
||||
and (FForwardProcBodyInsertPolicy=CodeToolsOpts.ForwardProcBodyInsertPolicy)
|
||||
and (FKeepForwardProcOrder=CodeToolsOpts.KeepForwardProcOrder)
|
||||
and (FUpdateMultiProcSignatures=CodeToolsOpts.UpdateMultiProcSignatures)
|
||||
and (FClassHeaderComments=CodeToolsOpts.ClassHeaderComments)
|
||||
and (FClassImplementationComments=CodeToolsOpts.ClassImplementationComments)
|
||||
and (FMethodInsertPolicy=CodeToolsOpts.FMethodInsertPolicy)
|
||||
@ -855,8 +877,9 @@ end;
|
||||
procedure TCodeToolsOptions.AssignTo(Dest: TPersistent);
|
||||
var
|
||||
Boss: TCodeToolManager absolute Dest;
|
||||
BeautifyCodeOptions: TBeautifyCodeOptions absolute Dest;
|
||||
Beauty: TBeautifyCodeOptions absolute Dest;
|
||||
begin
|
||||
debugln(['TCodeToolsOptions.AssignTo ',DbgSName(Dest)]);
|
||||
if Dest is TCodeToolManager then
|
||||
begin
|
||||
// General - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
@ -874,26 +897,28 @@ begin
|
||||
else
|
||||
if Dest is TBeautifyCodeOptions then
|
||||
begin
|
||||
BeautifyCodeOptions.LineLength:=LineLength;
|
||||
BeautifyCodeOptions.ClassPartInsertPolicy:=ClassPartInsertPolicy;
|
||||
BeautifyCodeOptions.MixMethodsAndProperties:=MixMethodsAndProperties;
|
||||
BeautifyCodeOptions.ForwardProcBodyInsertPolicy:=ForwardProcBodyInsertPolicy;
|
||||
BeautifyCodeOptions.KeepForwardProcOrder:=KeepForwardProcOrder;
|
||||
BeautifyCodeOptions.ClassHeaderComments:=ClassHeaderComments;
|
||||
BeautifyCodeOptions.ClassImplementationComments:=ClassImplementationComments;
|
||||
BeautifyCodeOptions.MethodInsertPolicy:=MethodInsertPolicy;
|
||||
BeautifyCodeOptions.KeyWordPolicy:=KeyWordPolicy;
|
||||
BeautifyCodeOptions.IdentifierPolicy:=IdentifierPolicy;
|
||||
BeautifyCodeOptions.SetupWordPolicyExceptions(WordPolicyExceptions);
|
||||
BeautifyCodeOptions.DoNotSplitLineInFront:=DoNotSplitLineInFront;
|
||||
BeautifyCodeOptions.DoNotSplitLineAfter:=DoNotSplitLineAfter;
|
||||
BeautifyCodeOptions.DoInsertSpaceInFront:=DoInsertSpaceInFront;
|
||||
BeautifyCodeOptions.DoInsertSpaceAfter:=DoInsertSpaceAfter;
|
||||
BeautifyCodeOptions.PropertyReadIdentPrefix:=PropertyReadIdentPrefix;
|
||||
BeautifyCodeOptions.PropertyWriteIdentPrefix:=PropertyWriteIdentPrefix;
|
||||
BeautifyCodeOptions.PropertyStoredIdentPostfix:=PropertyStoredIdentPostfix;
|
||||
BeautifyCodeOptions.PrivateVariablePrefix:=PrivateVariablePrefix;
|
||||
BeautifyCodeOptions.UsesInsertPolicy:=UsesInsertPolicy;
|
||||
Beauty.LineLength:=LineLength;
|
||||
Beauty.ClassPartInsertPolicy:=ClassPartInsertPolicy;
|
||||
Beauty.MixMethodsAndProperties:=MixMethodsAndProperties;
|
||||
Beauty.UpdateAllMethodSignatures:=UpdateAllMethodSignatures;
|
||||
Beauty.ForwardProcBodyInsertPolicy:=ForwardProcBodyInsertPolicy;
|
||||
Beauty.KeepForwardProcOrder:=KeepForwardProcOrder;
|
||||
Beauty.UpdateMultiProcSignatures:=UpdateMultiProcSignatures;
|
||||
Beauty.ClassHeaderComments:=ClassHeaderComments;
|
||||
Beauty.ClassImplementationComments:=ClassImplementationComments;
|
||||
Beauty.MethodInsertPolicy:=MethodInsertPolicy;
|
||||
Beauty.KeyWordPolicy:=KeyWordPolicy;
|
||||
Beauty.IdentifierPolicy:=IdentifierPolicy;
|
||||
Beauty.SetupWordPolicyExceptions(WordPolicyExceptions);
|
||||
Beauty.DoNotSplitLineInFront:=DoNotSplitLineInFront;
|
||||
Beauty.DoNotSplitLineAfter:=DoNotSplitLineAfter;
|
||||
Beauty.DoInsertSpaceInFront:=DoInsertSpaceInFront;
|
||||
Beauty.DoInsertSpaceAfter:=DoInsertSpaceAfter;
|
||||
Beauty.PropertyReadIdentPrefix:=PropertyReadIdentPrefix;
|
||||
Beauty.PropertyWriteIdentPrefix:=PropertyWriteIdentPrefix;
|
||||
Beauty.PropertyStoredIdentPostfix:=PropertyStoredIdentPostfix;
|
||||
Beauty.PrivateVariablePrefix:=PrivateVariablePrefix;
|
||||
Beauty.UsesInsertPolicy:=UsesInsertPolicy;
|
||||
end
|
||||
else
|
||||
inherited AssignTo(Dest);
|
||||
|
||||
@ -7,8 +7,8 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
ClientWidth = 572
|
||||
TabOrder = 0
|
||||
Visible = False
|
||||
DesignLeft = 334
|
||||
DesignTop = 307
|
||||
DesignLeft = 336
|
||||
DesignTop = 176
|
||||
object ClassPartInsertPolicyRadioGroup: TRadioGroup
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = Owner
|
||||
@ -63,21 +63,21 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
AnchorSideTop.Control = ClassPartInsertPolicyRadioGroup
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 22
|
||||
Height = 18
|
||||
Top = 106
|
||||
Width = 220
|
||||
Width = 249
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'MixMethodsAndPropertiesCheckBox'
|
||||
TabOrder = 2
|
||||
end
|
||||
object ClassHeaderCommentsCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = MixMethodsAndPropertiesCheckBox
|
||||
AnchorSideTop.Control = UpdateAllMethodSignaturesCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 22
|
||||
Top = 134
|
||||
Width = 209
|
||||
Height = 18
|
||||
Top = 154
|
||||
Width = 228
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'ClassHeaderCommentsCheckBox'
|
||||
TabOrder = 3
|
||||
@ -90,23 +90,23 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
AnchorSideRight.Side = asrBottom
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 176
|
||||
Top = 190
|
||||
Height = 168
|
||||
Top = 202
|
||||
Width = 572
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
AutoSize = True
|
||||
BorderSpacing.Top = 6
|
||||
Caption = 'PropertyCompletionGroupBox'
|
||||
ClientHeight = 160
|
||||
ClientWidth = 568
|
||||
ClientHeight = 146
|
||||
ClientWidth = 564
|
||||
TabOrder = 4
|
||||
object PropertyCompletionCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = PropertyCompletionGroupBox
|
||||
AnchorSideTop.Control = PropertyCompletionGroupBox
|
||||
Left = 6
|
||||
Height = 22
|
||||
Height = 18
|
||||
Top = 6
|
||||
Width = 188
|
||||
Width = 208
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'PropertyCompletionCheckBox'
|
||||
TabOrder = 0
|
||||
@ -118,24 +118,24 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
AnchorSideRight.Control = PropertyCompletionGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 120
|
||||
Top = 34
|
||||
Width = 556
|
||||
Height = 110
|
||||
Top = 30
|
||||
Width = 552
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
AutoSize = True
|
||||
BorderSpacing.Around = 6
|
||||
BevelOuter = bvNone
|
||||
ChildSizing.Layout = cclTopToBottomThenLeftToRight
|
||||
ChildSizing.ControlsPerLine = 5
|
||||
ClientHeight = 120
|
||||
ClientWidth = 556
|
||||
ClientHeight = 110
|
||||
ClientWidth = 552
|
||||
TabOrder = 1
|
||||
object SetPropertyVariablenameLabel: TLabel
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 7
|
||||
Height = 15
|
||||
Top = 4
|
||||
Width = 171
|
||||
Left = 11
|
||||
Height = 16
|
||||
Top = 3
|
||||
Width = 191
|
||||
BorderSpacing.Right = 6
|
||||
BorderSpacing.CellAlignHorizontal = ccaRightBottom
|
||||
BorderSpacing.CellAlignVertical = ccaCenter
|
||||
@ -144,10 +144,10 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
end
|
||||
object PrivateVariablePrefixLabel: TLabel
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 34
|
||||
Height = 15
|
||||
Top = 28
|
||||
Width = 144
|
||||
Left = 39
|
||||
Height = 16
|
||||
Top = 25
|
||||
Width = 163
|
||||
BorderSpacing.Right = 6
|
||||
BorderSpacing.CellAlignHorizontal = ccaRightBottom
|
||||
BorderSpacing.CellAlignVertical = ccaCenter
|
||||
@ -157,9 +157,9 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
object PropertyStoredIdentPostfixLabel: TLabel
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 0
|
||||
Height = 15
|
||||
Top = 52
|
||||
Width = 178
|
||||
Height = 16
|
||||
Top = 47
|
||||
Width = 202
|
||||
BorderSpacing.Right = 6
|
||||
BorderSpacing.CellAlignHorizontal = ccaRightBottom
|
||||
BorderSpacing.CellAlignVertical = ccaCenter
|
||||
@ -168,10 +168,10 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
end
|
||||
object PropertyWriteIdentPrefixLabel: TLabel
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 13
|
||||
Height = 15
|
||||
Top = 76
|
||||
Width = 165
|
||||
Left = 15
|
||||
Height = 16
|
||||
Top = 69
|
||||
Width = 187
|
||||
BorderSpacing.Right = 6
|
||||
BorderSpacing.CellAlignHorizontal = ccaRightBottom
|
||||
BorderSpacing.CellAlignVertical = ccaCenter
|
||||
@ -180,10 +180,10 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
end
|
||||
object PropertyReadIdentPrefixLabel: TLabel
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 13
|
||||
Height = 15
|
||||
Top = 100
|
||||
Width = 165
|
||||
Left = 17
|
||||
Height = 16
|
||||
Top = 91
|
||||
Width = 185
|
||||
BorderSpacing.Right = 6
|
||||
BorderSpacing.CellAlignHorizontal = ccaRightBottom
|
||||
BorderSpacing.CellAlignVertical = ccaCenter
|
||||
@ -193,8 +193,8 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
object SetPropertyVariablenameEdit: TEdit
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 184
|
||||
Height = 24
|
||||
Left = 208
|
||||
Height = 22
|
||||
Top = 0
|
||||
Width = 80
|
||||
TabOrder = 0
|
||||
@ -203,9 +203,9 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
object PrivateVariablePrefixEdit: TEdit
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 184
|
||||
Height = 24
|
||||
Top = 24
|
||||
Left = 208
|
||||
Height = 22
|
||||
Top = 22
|
||||
Width = 80
|
||||
TabOrder = 1
|
||||
Text = 'PrivateVariablePrefixEdit'
|
||||
@ -213,9 +213,9 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
object PropertyStoredIdentPostfixEdit: TEdit
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 184
|
||||
Height = 24
|
||||
Top = 48
|
||||
Left = 208
|
||||
Height = 22
|
||||
Top = 44
|
||||
Width = 80
|
||||
TabOrder = 2
|
||||
Text = 'PropertyStoredIdentPostfixEdit'
|
||||
@ -223,9 +223,9 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
object PropertyWriteIdentPrefixEdit: TEdit
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 184
|
||||
Height = 24
|
||||
Top = 72
|
||||
Left = 208
|
||||
Height = 22
|
||||
Top = 66
|
||||
Width = 80
|
||||
TabOrder = 3
|
||||
Text = 'PropertyWriteIdentPrefixEdit'
|
||||
@ -233,9 +233,9 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
object PropertyReadIdentPrefixEdit: TEdit
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 184
|
||||
Height = 24
|
||||
Top = 96
|
||||
Left = 208
|
||||
Height = 22
|
||||
Top = 88
|
||||
Width = 80
|
||||
TabOrder = 4
|
||||
Text = 'PropertyReadIdentPrefixEdit'
|
||||
@ -247,11 +247,23 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
|
||||
AnchorSideTop.Control = ClassHeaderCommentsCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 22
|
||||
Top = 162
|
||||
Width = 257
|
||||
Height = 18
|
||||
Top = 178
|
||||
Width = 283
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'ClassImplementationCommentsCheckBox'
|
||||
TabOrder = 5
|
||||
end
|
||||
object UpdateAllMethodSignaturesCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = MixMethodsAndPropertiesCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 18
|
||||
Top = 130
|
||||
Width = 257
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'UpdateAllMethodSignaturesCheckBox'
|
||||
TabOrder = 6
|
||||
end
|
||||
end
|
||||
|
||||
@ -51,6 +51,7 @@ type
|
||||
PropertyWriteIdentPrefixLabel: TLabel;
|
||||
SetPropertyVariablenameEdit: TEdit;
|
||||
SetPropertyVariablenameLabel: TLabel;
|
||||
UpdateAllMethodSignaturesCheckBox: TCheckBox;
|
||||
private
|
||||
{ private declarations }
|
||||
public
|
||||
@ -85,9 +86,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
with MixMethodsAndPropertiesCheckBox do
|
||||
Caption:=dlgMixMethodsAndProperties;
|
||||
|
||||
with MethodInsertPolicyRadioGroup do begin
|
||||
Caption:=dlgInsertMethods;
|
||||
with Items do begin
|
||||
@ -99,8 +97,11 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
MixMethodsAndPropertiesCheckBox.Caption:=dlgMixMethodsAndProperties;
|
||||
UpdateAllMethodSignaturesCheckBox.Caption:=lisCTOUpdateAllMethodSignatures;
|
||||
ClassHeaderCommentsCheckBox.Caption:=lisHeaderCommentForClass;
|
||||
ClassImplementationCommentsCheckBox.Caption:=lisImplementationCommentForClass;
|
||||
|
||||
PropertyCompletionGroupBox.Caption:=dlgPropertyCompletion;
|
||||
PropertyCompletionCheckBox.Caption:=dlgCompleteProperties;
|
||||
PropertyReadIdentPrefixLabel.Caption:=dlgCDTReadPrefix;
|
||||
@ -124,7 +125,7 @@ begin
|
||||
end;
|
||||
|
||||
MixMethodsAndPropertiesCheckBox.Checked := MixMethodsAndProperties;
|
||||
|
||||
UpdateAllMethodSignaturesCheckBox.Checked:=UpdateAllMethodSignatures;
|
||||
ClassHeaderCommentsCheckBox.Checked := ClassHeaderComments;
|
||||
ClassImplementationCommentsCheckBox.Checked := ClassImplementationComments;
|
||||
case MethodInsertPolicy of
|
||||
@ -157,7 +158,7 @@ begin
|
||||
end;
|
||||
|
||||
MixMethodsAndProperties := MixMethodsAndPropertiesCheckBox.Checked;
|
||||
|
||||
UpdateAllMethodSignatures:=UpdateAllMethodSignaturesCheckBox.Checked;
|
||||
ClassHeaderComments := ClassHeaderCommentsCheckBox.Checked;
|
||||
ClassImplementationComments := ClassImplementationCommentsCheckBox.Checked;
|
||||
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
|
||||
object CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
|
||||
Left = 0
|
||||
Height = 377
|
||||
Top = 0
|
||||
Width = 572
|
||||
ClientHeight = 373
|
||||
ClientWidth = 568
|
||||
ClientHeight = 377
|
||||
ClientWidth = 572
|
||||
TabOrder = 0
|
||||
Visible = False
|
||||
DesignLeft = 313
|
||||
DesignTop = 275
|
||||
object ForwardProcsInsertPolicyRadioGroup: TRadioGroup[0]
|
||||
object ForwardProcsInsertPolicyRadioGroup: TRadioGroup
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = Owner
|
||||
AnchorSideRight.Control = Owner
|
||||
@ -15,7 +17,7 @@ inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
|
||||
Left = 6
|
||||
Height = 100
|
||||
Top = 6
|
||||
Width = 556
|
||||
Width = 560
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
AutoFill = True
|
||||
BorderSpacing.Around = 6
|
||||
@ -30,19 +32,19 @@ inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
|
||||
ChildSizing.ControlsPerLine = 1
|
||||
TabOrder = 0
|
||||
end
|
||||
object ForwardProcsKeepOrderCheckBox: TCheckBox[1]
|
||||
object ForwardProcsKeepOrderCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = ForwardProcsInsertPolicyRadioGroup
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 22
|
||||
Height = 18
|
||||
Top = 112
|
||||
Width = 239
|
||||
Width = 235
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'ForwardProcsKeepOrderCheckBox'
|
||||
TabOrder = 1
|
||||
end
|
||||
object UsesInsertPolicyRadioGroup: TRadioGroup[2]
|
||||
object UsesInsertPolicyRadioGroup: TRadioGroup
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = ForwardProcsKeepOrderCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
@ -50,8 +52,8 @@ inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 100
|
||||
Top = 146
|
||||
Width = 556
|
||||
Top = 142
|
||||
Width = 560
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
AutoFill = True
|
||||
AutoSize = True
|
||||
@ -69,4 +71,16 @@ inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
|
||||
Constraints.MinHeight = 100
|
||||
TabOrder = 2
|
||||
end
|
||||
object UpdateMultiProcSignaturesCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = UsesInsertPolicyRadioGroup
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 18
|
||||
Top = 248
|
||||
Width = 252
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'UpdateMultiProcSignaturesCheckBox'
|
||||
TabOrder = 3
|
||||
end
|
||||
end
|
||||
|
||||
@ -35,6 +35,7 @@ type
|
||||
TCodetoolsCodeCreationOptionsFrame = class(TAbstractIDEOptionsEditor)
|
||||
ForwardProcsInsertPolicyRadioGroup: TRadioGroup;
|
||||
ForwardProcsKeepOrderCheckBox: TCheckBox;
|
||||
UpdateMultiProcSignaturesCheckBox: TCheckBox;
|
||||
UsesInsertPolicyRadioGroup: TRadioGroup;
|
||||
private
|
||||
public
|
||||
@ -70,8 +71,9 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
with ForwardProcsKeepOrderCheckBox do
|
||||
Caption:=dlgForwardProcsKeepOrder;
|
||||
ForwardProcsKeepOrderCheckBox.Caption:=dlgForwardProcsKeepOrder;
|
||||
UpdateMultiProcSignaturesCheckBox.Caption:=
|
||||
lisCTOUpdateMultipleProcedureSignatures;
|
||||
|
||||
with UsesInsertPolicyRadioGroup do begin
|
||||
Caption:=lisNewUnitsAreAddedToUsesSections;
|
||||
@ -101,6 +103,7 @@ begin
|
||||
end;
|
||||
|
||||
ForwardProcsKeepOrderCheckBox.Checked := KeepForwardProcOrder;
|
||||
UpdateMultiProcSignaturesCheckBox.Checked:=UpdateMultiProcSignatures;
|
||||
|
||||
case UsesInsertPolicy of
|
||||
uipFirst: UsesInsertPolicyRadioGroup.ItemIndex:=0;
|
||||
@ -126,6 +129,7 @@ begin
|
||||
end;
|
||||
|
||||
KeepForwardProcOrder := ForwardProcsKeepOrderCheckBox.Checked;
|
||||
UpdateMultiProcSignatures:=UpdateMultiProcSignaturesCheckBox.Checked;
|
||||
|
||||
case UsesInsertPolicyRadioGroup.ItemIndex of
|
||||
0: UsesInsertPolicy:=uipFirst;
|
||||
|
||||
@ -5781,6 +5781,9 @@ resourcestring
|
||||
lisUDFilter = '(Filter)';
|
||||
lisUDSearch = '(Search)';
|
||||
lisUDUnits2 = 'Units: %s';
|
||||
lisCTOUpdateAllMethodSignatures = 'Update all method signatures';
|
||||
lisCTOUpdateMultipleProcedureSignatures = 'Update multiple procedure '
|
||||
+'signatures';
|
||||
|
||||
implementation
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user