From d6cee91c235f699c1eb7287cb81a1c65db9ee599 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Thu, 11 Apr 2013 10:15:51 +0000
Subject: [PATCH] IDE: moved creating new unit source to sourefilemanager, it
 needs editor options

git-svn-id: trunk@40789 -
---
 ide/project.pp            | 19 -------------------
 ide/sourcefilemanager.pas |  8 ++++++--
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/ide/project.pp b/ide/project.pp
index 4ce7c18c33..3666288ac0 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -360,8 +360,6 @@ type
     procedure ClearModifieds; override;
     procedure ClearComponentDependencies;
     procedure WriteDebugReportUnitComponentDependencies(Prefix: string);
-    procedure CreateStartCode(Descriptor: TProjectFileDescriptor;
-                              const NewUnitName: string);
     procedure IgnoreCurrentFileDateOnDisk;
     procedure IncreaseAutoRevertLock; // do not auto revert from disk
     procedure DecreaseAutoRevertLock;
@@ -2314,23 +2312,6 @@ begin
     fSource.ReadOnly:=ReadOnly;
 end;
 
-procedure TUnitInfo.CreateStartCode(Descriptor: TProjectFileDescriptor;
-  const NewUnitName: string);
-var
-  NewSource: string;
-  
-  function Beautified(const s: string): string;
-  begin
-    Result:=CodeToolBoss.SourceChangeCache.BeautifyCodeOptions.BeautifyStatement(s,0);
-  end;
-  
-begin
-  if fSource=nil then exit;
-  NewSource:=Beautified(Descriptor.CreateSource(Filename,NewUnitName,fComponentName));
-  fSource.Source:=NewSource;
-  Modified:=true;
-end;
-
 function TUnitInfo.GetHasResources:boolean;
 begin
   Result:=fHasResources or (ComponentName<>'');
diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 2472aef578..6b72f9dcbe 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -415,6 +415,7 @@ var
   APackage: TLazPackage;
   IsPartOfProject: Boolean;
   RequiredPackages: String;
+  Src: String;
 begin
   //debugln('TLazSourceFileManager.NewEditorFile A NewFilename=',NewFilename);
   // empty NewFilename is ok, it will be auto generated
@@ -534,14 +535,17 @@ begin
       NewUnitInfo.ComponentName:=NewUniqueComponentName(NewFileDescriptor.DefaultResourceName);
       NewUnitInfo.ComponentResourceName:='';
     end;
-    NewUnitInfo.CreateStartCode(NewFileDescriptor,NewUnitName);
+    Src:=NewFileDescriptor.CreateSource(NewUnitInfo.Filename,NewUnitName,NewUnitInfo.ComponentName);
+    // ToDo: use editor options Block Indent Spaces+Tabs
+    Src:=CodeToolBoss.SourceChangeCache.BeautifyCodeOptions.BeautifyStatement(Src,0);
+    NewUnitInfo.Source.Source:=Src;
   end else begin
     if nfBeautifySrc in NewFlags then
       NewBuffer.Source:=BeautifySrc(NewSource)
     else
       NewBuffer.Source:=NewSource;
-    NewUnitInfo.Modified:=true;
   end;
+  NewUnitInfo.Modified:=true;
 
   // add to project
   NewUnitInfo.Loaded:=true;