codetools: class completion: fixed indentation of bodies

git-svn-id: trunk@34173 -

components/codetools/codecompletiontool.pas

@@ -133,7 +133,8 @@ type
     fNewMainUsesSectionUnits: TAVLTree; // tree of AnsiString
     procedure AddNewPropertyAccessMethodsToClassProcs(ClassProcs: TAVLTree;
         const TheClassName: string);
-    procedure CheckForOverrideAndAddInheritedCode(ANodeExt: TCodeTreeNodeExtension);
+    procedure CheckForOverrideAndAddInheritedCode(
+      ANodeExt: TCodeTreeNodeExtension; Indent: integer);
     function CompleteProperty(PropNode: TCodeTreeNode): boolean;
     procedure SetCodeCompleteClassNode(const AClassNode: TCodeTreeNode);
     procedure SetCodeCompleteSrcChgCache(const AValue: TSourceChangeCache);
@@ -7028,7 +7029,7 @@ begin
 end;
 
 procedure TCodeCompletionCodeTool.CheckForOverrideAndAddInheritedCode(
-  ANodeExt: TCodeTreeNodeExtension);
+  ANodeExt: TCodeTreeNodeExtension; Indent: integer);
 // check for 'override' directive and add 'inherited' code to body
 var
   ProcCode, ProcCall: string;
@@ -7086,7 +7087,7 @@ begin
         ProcCall:=Beauty.BeautifyIdentifier('Result')+':='+ProcCall;
       ProcCode:=ProcCode+Beauty.LineEnd+'begin'+Beauty.LineEnd
                      +GetIndentStr(Beauty.Indent)+ProcCall+Beauty.LineEnd+'end;';
-      ProcCode:=Beauty.BeautifyProc(ProcCode,0,false);
+      ProcCode:=Beauty.BeautifyProc(ProcCode,Indent,false);
       ANodeExt.ExtTxt3:=ProcCode;
     end;
   end;
@@ -7135,7 +7136,7 @@ var
     ANode: TCodeTreeNode;
     ProcCode: string;
   begin
-    CheckForOverrideAndAddInheritedCode(TheNodeExt);
+    CheckForOverrideAndAddInheritedCode(TheNodeExt,Indent);
     if (TheNodeExt.ExtTxt1='') and (TheNodeExt.ExtTxt3='') then begin
       ANode:=TheNodeExt.Node;
       if (ANode<>nil) and (ANode.Desc=ctnProcedure) then begin
@@ -7575,7 +7576,7 @@ begin
       DebugLn('TCodeCompletionCodeTool.CreateMissingProcBodies Starting class in implementation ');
       {$ENDIF}
       FindInsertPointForNewClass(InsertPos,Indent);
-      //debugln(['TCodeCompletionCodeTool.CreateMissingProcBodies InsertPos=',dbgstr(copy(Src,InsertPos-10,10)),'|',dbgstr(copy(Src,InsertPos,10))]);
+      //debugln(['TCodeCompletionCodeTool.CreateMissingProcBodies Indent=',Indent,' InsertPos=',dbgstr(copy(Src,InsertPos-10,10)),'|',dbgstr(copy(Src,InsertPos,10))]);
       InsertClassMethodsComment(InsertPos,Indent);
 
       // insert all proc bodies
@@ -7673,7 +7674,7 @@ begin
             end;
           end;
           CreateCodeForMissingProcBody(ANodeExt,Indent);
-          InsertProcBody(ANodeExt,InsertPos,Indent);
+          InsertProcBody(ANodeExt,InsertPos,0);
         end;
         MissingNode:=ClassProcs.FindPrecessor(MissingNode);
       end;

components/codetools/ide/codyidentifiersdlg.pas

@@ -25,12 +25,9 @@
     Dialog to view and search the whole list.
 
   ToDo:
-    -put exact match at start
     -quickfix for identifier not found
     -use identifier: check package version
-    -clean up old entries
-      -When, How?
-      -maximum number of units
+    -check for unit conflict
     -gzip? lot of cpu, may be faster on first load
 }
 unit CodyIdentifiersDlg;

components/synedit/allsynedit.pas

@@ -7,25 +7,29 @@ unit allsynedit;
 interface
 
 uses
-  SynBeautifier, SynCompletion, SynDesignStringConstants, SynEdit, SynEditAutoComplete, 
-  SynEditExport, SynEditFoldedView, SynEditHighlighter, SynEditHighlighterFoldBase, 
-  SynEditHighlighterXMLBase, SynEditKeyCmds, SynEditLazDsgn, SynEditLines, SynEditMarks, 
-  SynEditMarkup, SynEditMarkupBracket, SynEditMarkupCtrlMouseLink, SynEditMarkupHighAll, 
+  SynBeautifier, SynCompletion, SynDesignStringConstants, SynEdit, 
+  SynEditAutoComplete, SynEditExport, SynEditFoldedView, SynEditHighlighter, 
+  SynEditHighlighterFoldBase, SynEditHighlighterXMLBase, SynEditKeyCmds, 
+  SynEditLazDsgn, SynEditLines, SynEditMarks, SynEditMarkup, 
+  SynEditMarkupBracket, SynEditMarkupCtrlMouseLink, SynEditMarkupHighAll, 
   SynEditMarkupSelection, SynEditMarkupSpecialLine, SynEditMarkupWordGroup, 
   SynEditMiscClasses, SynEditMiscProcs, SynEditMouseCmds, SynEditPlugins, 
-  SynEditPointClasses, SynEditRegexSearch, SynEditSearch, SynEditStrConst, SynEditTextBase, 
-  SynEditTextBuffer, SynEditTextDoubleWidthChars, SynEditTextTabExpander, SynEditTextTrimmer, 
-  SynEditTypes, SynExportHTML, SynGutter, SynGutterBase, SynGutterChanges, 
-  SynGutterCodeFolding, SynGutterLineNumber, SynGutterLineOverview, SynGutterMarks, 
+  SynEditPointClasses, SynEditRegexSearch, SynEditSearch, SynEditStrConst, 
+  SynEditTextBase, SynEditTextBuffer, SynEditTextDoubleWidthChars, 
+  SynEditTextTabExpander, SynEditTextTrimmer, SynEditTypes, SynExportHTML, 
+  SynGutter, SynGutterBase, SynGutterChanges, SynGutterCodeFolding, 
+  SynGutterLineNumber, SynGutterLineOverview, SynGutterMarks, 
   SynHighlighterAny, SynHighlighterCpp, SynHighlighterCss, SynHighlighterDiff, 
-  SynHighlighterHashEntries, SynHighlighterHTML, SynHighlighterJava, SynHighlighterJScript, 
-  SynHighlighterLFM, SynHighlighterMulti, SynHighlighterPas, SynHighlighterPerl, 
-  SynHighlighterPHP, SynHighlighterPosition, SynHighlighterPython, SynHighlighterSQL, 
-  SynHighlighterTeX, synhighlighterunixshellscript, SynHighlighterVB, SynHighlighterXML, 
-  SynMacroRecorder, SynMemo, SynPluginSyncroEdit, SynPluginSyncronizedEditBase, 
-  SynPluginTemplateEdit, SynPropertyEditObjectList, SynRegExpr, SynTextDrawer, 
-  SynEditMarkupGutterMark, SynHighlighterBat, SynHighlighterIni, SynEditMarkupSpecialChar, 
-  LazSynEditText, LazarusPackageIntf;
+  SynHighlighterHashEntries, SynHighlighterHTML, SynHighlighterJava, 
+  SynHighlighterJScript, SynHighlighterLFM, SynHighlighterMulti, 
+  SynHighlighterPas, SynHighlighterPerl, SynHighlighterPHP, 
+  SynHighlighterPosition, SynHighlighterPython, SynHighlighterSQL, 
+  SynHighlighterTeX, synhighlighterunixshellscript, SynHighlighterVB, 
+  SynHighlighterXML, SynMacroRecorder, SynMemo, SynPluginSyncroEdit, 
+  SynPluginSyncronizedEditBase, SynPluginTemplateEdit, 
+  SynPropertyEditObjectList, SynRegExpr, SynTextDrawer, 
+  SynEditMarkupGutterMark, SynHighlighterBat, SynHighlighterIni, 
+  SynEditMarkupSpecialChar, LazarusPackageIntf;
 
 implementation