mirror of https://gitlab.com/basile.b/dexed.git
fix #327 - Block indentation always inserts spaces
This commit is contained in:
parent
d73a3fc37a
commit
f854d63a6b
|
@ -706,7 +706,6 @@ begin
|
||||||
anEditor.HighlightAllColor.Assign(fIdentifierMarkup);
|
anEditor.HighlightAllColor.Assign(fIdentifierMarkup);
|
||||||
anEditor.LineHighlightColor.Assign(fCurrLineAttribs);
|
anEditor.LineHighlightColor.Assign(fCurrLineAttribs);
|
||||||
anEditor.TabWidth := tabulationWidth;
|
anEditor.TabWidth := tabulationWidth;
|
||||||
anEditor.BlockIndent := blockIndentation;
|
|
||||||
anEditor.ExtraLineSpacing := lineSpacing;
|
anEditor.ExtraLineSpacing := lineSpacing;
|
||||||
anEditor.ExtraCharSpacing := characterSpacing;
|
anEditor.ExtraCharSpacing := characterSpacing;
|
||||||
anEditor.Options := options1;
|
anEditor.Options := options1;
|
||||||
|
@ -727,6 +726,17 @@ begin
|
||||||
anEditor.setDscannerOptions(fDscannerEnabled, fDscannerDelay);
|
anEditor.setDscannerOptions(fDscannerEnabled, fDscannerDelay);
|
||||||
anEditor.scrollPreview:=fScrollPreview;
|
anEditor.scrollPreview:=fScrollPreview;
|
||||||
|
|
||||||
|
if not (eoTabsToSpaces in options1) then
|
||||||
|
begin
|
||||||
|
anEditor.BlockIndent := 0;
|
||||||
|
anEditor.BlockTabIndent := 1;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
anEditor.BlockIndent := blockIndentation;
|
||||||
|
anEditor.BlockTabIndent := 0;
|
||||||
|
end;
|
||||||
|
|
||||||
cs := [];
|
cs := [];
|
||||||
for c in fCloseCompletionCharsWithSpace do
|
for c in fCloseCompletionCharsWithSpace do
|
||||||
include(cs, c);
|
include(cs, c);
|
||||||
|
|
|
@ -3608,6 +3608,16 @@ begin
|
||||||
free;
|
free;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
if not (eoTabsToSpaces in Options) then
|
||||||
|
begin
|
||||||
|
BlockIndent := 0;
|
||||||
|
BlockTabIndent := 1;
|
||||||
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
BlockIndent := TabWidth;
|
||||||
|
BlockTabIndent := 0;
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue