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

IDE: reindent new unit pascal

Browse Source 
git-svn-id: trunk@40807 -
This commit is contained in:
mattias 2013-04-14 19:16:51 +00:00
parent bf56f3685f
commit 28f7611143
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/mainintf.pas
View File

@ -62,9 +62,10 @@ uses
Classes, LCLType, LCLIntf, Buttons, Menus, SysUtils,
typinfo, Controls, Graphics, ExtCtrls, Dialogs, FileUtil, Forms,
CodeToolManager, CodeCache, AVL_Tree, SynEditKeyCmds,
// IDE
// IDEIntf
PropEdits, ObjectInspector, MenuIntf, SrcEditorIntf, ProjectIntf,
CompOptsIntf, LazIDEIntf,
// IDE
LazConf, LazarusIDEStrConsts,
ProjectDefs, Project, PublishModule, BuildLazDialog,
TransferMacros, IDEDefs, ProgressDlg,

43
ide/sourcefilemanager.pas
View File

@ -34,17 +34,16 @@ uses
AVL_Tree, typinfo, math, Classes, SysUtils, Controls, Forms, Dialogs, LCLIntf,
LCLType, LCLProc, FileProcs, FileUtil, IDEProcs, DialogProcs, IDEDialogs,
LConvEncoding, LResources, PropEdits, DefineTemplates, IDEMsgIntf,
IDEProtocol, LazarusIDEStrConsts, NewDialog, NewProjectDlg,
LazIDEIntf, MainBase, MainBar, MainIntf, MenuIntf, NewItemIntf,
ProjectIntf, Project, ProjectDefs, ProjectInspector, CompilerOptions,
BasePkgManager, PackageIntf, PackageDefs, PackageSystem,
SrcEditorIntf, IDEWindowIntf, ComponentReg, SourceEditor, EditorOptions,
CustomFormEditor, FormEditor, EmptyMethodsDlg, BaseDebugManager,
ControlSelection, TransferMacros, EnvironmentOpts, BuildManager, Designer,
EditorMacroListViewer, KeywordFuncLists, FindRenameIdentifier, MsgView,
InputHistory, CheckLFMDlg, LCLMemManager, CodeToolManager, CodeToolsStructs,
ConvCodeTool, CodeCache, CodeTree, FindDeclarationTool, BasicCodeTools,
UnitResources;
IDEProtocol, LazarusIDEStrConsts, NewDialog, NewProjectDlg, LazIDEIntf,
MainBase, MainBar, MainIntf, MenuIntf, NewItemIntf, ProjectIntf, Project,
ProjectDefs, ProjectInspector, CompilerOptions, BasePkgManager, PackageIntf,
PackageDefs, PackageSystem, SrcEditorIntf, IDEWindowIntf, ComponentReg,
SourceEditor, EditorOptions, CustomFormEditor, FormEditor, EmptyMethodsDlg,
BaseDebugManager, ControlSelection, TransferMacros, EnvironmentOpts,
BuildManager, Designer, EditorMacroListViewer, KeywordFuncLists,
FindRenameIdentifier, MsgView, InputHistory, CheckLFMDlg, LCLMemManager,
CodeToolManager, CodeToolsStructs, ConvCodeTool, CodeCache, CodeTree,
FindDeclarationTool, BasicCodeTools, SynEdit, UnitResources;
type
@ -108,6 +107,7 @@ type
AncestorType: TPersistentClass; ResourceCode: TCodeBuffer;
UseCreateFormStatements, DisableAutoSize: Boolean): TModalResult;
function NewUniqueComponentName(Prefix: string): string;
function ReIndent(const Src: string; OldIndent: integer = 0; OldTabWidth: integer = 4): string;
// methods for 'save unit'
function ShowSaveFileAsDialog(var AFilename: string; AnUnitInfo: TUnitInfo;
@ -536,7 +536,8 @@ begin
NewUnitInfo.ComponentResourceName:='';
end;
Src:=NewFileDescriptor.CreateSource(NewUnitInfo.Filename,NewUnitName,NewUnitInfo.ComponentName);
// ToDo: use editor options Block Indent Spaces+Tabs
Src:=ReIndent(Src);
//debugln(['TLazSourceFileManager.NewFile ',dbgtext(Src)]);
Src:=CodeToolBoss.SourceChangeCache.BeautifyCodeOptions.BeautifyStatement(Src,0);
NewUnitInfo.Source.Source:=Src;
end else begin
@ -2541,6 +2542,24 @@ begin
until IdentifierIsOk(Result);
end;
function TLazSourceFileManager.ReIndent(const Src: string; OldIndent: integer;
OldTabWidth: integer): string;
var
NewTabWidth: Integer;
NewIndent: Integer;
begin
if OldIndent=0 then
GuessIndentSize(Src,OldIndent,EditorOpts.TabWidth);
if (eoTabsToSpaces in EditorOpts.SynEditOptions)
or (EditorOpts.BlockTabIndent=0) then
NewTabWidth:=0
else
NewTabWidth:=EditorOpts.TabWidth;
NewIndent:=EditorOpts.BlockTabIndent*EditorOpts.TabWidth+EditorOpts.BlockIndent;
//debugln(['TLazSourceFileManager.ReIndent OldIndent=',OldIndent,' OldTabWidth=',OldTabWidth,' NewIndent=',NewIndent,' NewTabWidth=',NewTabWidth]);
Result:=BasicCodeTools.ReIndent(Src,OldIndent,OldTabWidth,NewIndent,NewTabWidth);
end;
function TLazSourceFileManager.ShowSaveFileAsDialog(var AFilename: string;
AnUnitInfo: TUnitInfo; var LFMCode, LRSCode: TCodeBuffer; CanAbort: boolean): TModalResult;
var