paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 07:17:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: moved creating new unit source to sourefilemanager, it needs editor options

Browse Source 
git-svn-id: trunk@40789 -
This commit is contained in:
mattias 2013-04-11 10:15:51 +00:00
parent 03db74c158
commit d6cee91c23
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ide/project.pp
View File

@ -360,8 +360,6 @@ type
procedure ClearModifieds; override; procedure ClearModifieds; override;
procedure ClearComponentDependencies; procedure ClearComponentDependencies;
procedure WriteDebugReportUnitComponentDependencies(Prefix: string); procedure WriteDebugReportUnitComponentDependencies(Prefix: string);
procedure CreateStartCode(Descriptor: TProjectFileDescriptor;
const NewUnitName: string);
procedure IgnoreCurrentFileDateOnDisk; procedure IgnoreCurrentFileDateOnDisk;
procedure IncreaseAutoRevertLock; // do not auto revert from disk procedure IncreaseAutoRevertLock; // do not auto revert from disk
procedure DecreaseAutoRevertLock; procedure DecreaseAutoRevertLock;
@ -2314,23 +2312,6 @@ begin
fSource.ReadOnly:=ReadOnly; fSource.ReadOnly:=ReadOnly;
end; 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; function TUnitInfo.GetHasResources:boolean;
begin begin
Result:=fHasResources or (ComponentName<>''); Result:=fHasResources or (ComponentName<>'');

8
ide/sourcefilemanager.pas
View File

@ -415,6 +415,7 @@ var
APackage: TLazPackage; APackage: TLazPackage;
IsPartOfProject: Boolean; IsPartOfProject: Boolean;
RequiredPackages: String; RequiredPackages: String;
Src: String;
begin begin
//debugln('TLazSourceFileManager.NewEditorFile A NewFilename=',NewFilename); //debugln('TLazSourceFileManager.NewEditorFile A NewFilename=',NewFilename);
// empty NewFilename is ok, it will be auto generated // empty NewFilename is ok, it will be auto generated
@ -534,14 +535,17 @@ begin
NewUnitInfo.ComponentName:=NewUniqueComponentName(NewFileDescriptor.DefaultResourceName); NewUnitInfo.ComponentName:=NewUniqueComponentName(NewFileDescriptor.DefaultResourceName);
NewUnitInfo.ComponentResourceName:=''; NewUnitInfo.ComponentResourceName:='';
end; 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 end else begin
if nfBeautifySrc in NewFlags then if nfBeautifySrc in NewFlags then
NewBuffer.Source:=BeautifySrc(NewSource) NewBuffer.Source:=BeautifySrc(NewSource)
else else
NewBuffer.Source:=NewSource; NewBuffer.Source:=NewSource;
NewUnitInfo.Modified:=true;
end; end;
NewUnitInfo.Modified:=true;
// add to project // add to project
NewUnitInfo.Loaded:=true; NewUnitInfo.Loaded:=true;