forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

editor, gives a hint about indentation to choose when mixed style is detected

This commit is contained in:
Basile Burg 2018-07-03 15:39:04 +02:00
parent 32e03e9a9b
commit 7afe6a8321
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ce_synmemo.pas
View File

@ -323,7 +323,7 @@ type
procedure save; procedure save;
procedure saveTempFile; procedure saveTempFile;
// //
function indentationMode: TIndentationMode; function indentationMode(out numTabs, numSpaces: integer): TIndentationMode;
procedure forceIndentation(m: TIndentationMode; w: integer); procedure forceIndentation(m: TIndentationMode; w: integer);
procedure addBreakPoint(line: integer); procedure addBreakPoint(line: integer);
procedure removeBreakPoint(line: integer); procedure removeBreakPoint(line: integer);
@ -410,7 +410,7 @@ type
class var fSpacesPerTab: integer; class var fSpacesPerTab: integer;
procedure spinSpacesPerTabChange(sender: TObject); procedure spinSpacesPerTabChange(sender: TObject);
public public
constructor construct(); constructor construct(numSpaces, numTabs: integer);
end; end;
procedure SetDefaultCoeditKeystrokes(ed: TSynEdit); procedure SetDefaultCoeditKeystrokes(ed: TSynEdit);
@ -581,7 +581,7 @@ end;
{$ENDREGION} {$ENDREGION}
{$REGION TMixedIndentationDialog} {$REGION TMixedIndentationDialog}
constructor TMixedIndentationDialog.construct(); constructor TMixedIndentationDialog.construct(numSpaces, numTabs: integer);
var var
pn: TPanel; pn: TPanel;
begin begin
@ -615,6 +615,7 @@ begin
parent := pn; parent := pn;
MinValue:= 1; MinValue:= 1;
MaxValue:= 8; MaxValue:= 8;
AutoSize:= true;
OnChange:= @spinSpacesPerTabChange; OnChange:= @spinSpacesPerTabChange;
hint := 'defines how many spaces per TAB will be used'; hint := 'defines how many spaces per TAB will be used';
ShowHint:=true; ShowHint:=true;
@ -646,8 +647,17 @@ begin
ModalResult:= 11; ModalResult:= 11;
BorderSpacing.Around:=4; BorderSpacing.Around:=4;
end; end;
with TLabel.Create(self) do
begin
Align := alTop;
parent := self;
AutoSize :=true;
BorderSpacing.Around:=8;
caption := format('this document is%s- indented %d times by TAB%s- indented %d times by (n)spaces',
[#13#10, numTabs, #13#10, numSpaces]);
end;
width := ScaleX(280, 96); width := ScaleX(280, 96);
height := ScaleY(150, 96); height := ScaleY(200, 96);
end; end;
procedure TMixedIndentationDialog.spinSpacesPerTabChange(sender: TObject); procedure TMixedIndentationDialog.spinSpacesPerTabChange(sender: TObject);
@ -1520,7 +1530,7 @@ begin
end; end;
end; end;
function TCESynMemo.indentationMode: TIndentationMode; function TCESynMemo.indentationMode(out numTabs, numSpaces: integer): TIndentationMode;
function checkLine(index: integer): TIndentationMode; function checkLine(index: integer): TIndentationMode;
var var
u: string; u: string;
@ -1552,6 +1562,8 @@ begin
result := imTabs result := imTabs
else else
result := imNone; result := imNone;
numTabs:= t;
numSpaces:= s;
end; end;
procedure TCESynMemo.forceIndentation(m: TIndentationMode; w: integer); procedure TCESynMemo.forceIndentation(m: TIndentationMode; w: integer);
@ -3587,13 +3599,16 @@ begin
end; end;
procedure TCESynMemo.tryToPatchMixedIndentation; procedure TCESynMemo.tryToPatchMixedIndentation;
var
s: integer;
t: integer;
begin begin
if fLifeTimeManager.isNotNil and not fIdentDialShown and (lines.Count <> 0) and if fLifeTimeManager.isNotNil and not fIdentDialShown and (lines.Count <> 0) and
((fLifeTimeManager as ICELifetimeManager).getLifetimeStatus = lfsLoaded) ((fLifeTimeManager as ICELifetimeManager).getLifetimeStatus = lfsLoaded)
then then
begin begin
fIdentDialShown := true; fIdentDialShown := true;
case indentationMode() of case indentationMode(t, s) of
imTabs: imTabs:
if detectIndentMode then if detectIndentMode then
Options:= Options - [eoTabsToSpaces]; Options:= Options - [eoTabsToSpaces];
@ -3604,7 +3619,7 @@ begin
if (isDSource or alwaysAdvancedFeatures) and if (isDSource or alwaysAdvancedFeatures) and
(dlgYesNo('Mixed indentation style detected in, "' + fFilename + (dlgYesNo('Mixed indentation style detected in, "' + fFilename +
'", do you wish to convert to a single mode ?') = mrYes) then '", do you wish to convert to a single mode ?') = mrYes) then
with TMixedIndentationDialog.construct() do with TMixedIndentationDialog.construct(s, t) do
try try
case ShowModal of case ShowModal of
10: 10: