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

fix, dfmt commander, invalid props could be typed, leading to AV

This commit is contained in:
Basile Burg 2015-12-21 05:57:52 +01:00
parent d718f35304
commit 447d6e9e3a
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ce_dfmt.lfm
View File

@ -26,7 +26,7 @@ inherited CEDfmtWidget: TCEDfmtWidget
Width = 442 Width = 442
Align = alClient Align = alClient
BorderSpacing.Around = 4 BorderSpacing.Around = 4
CheckboxForBoolean = False CheckboxForBoolean = True
DefaultValueFont.Color = clWindowText DefaultValueFont.Color = clWindowText
Filter = [tkInteger, tkChar, tkEnumeration, tkFloat, tkSet, tkMethod, tkSString, tkLString, tkAString, tkWString, tkVariant, tkArray, tkRecord, tkInterface, tkClass, tkObject, tkWChar, tkBool, tkInt64, tkQWord, tkDynArray, tkInterfaceRaw, tkProcVar, tkUString, tkUChar, tkHelper] Filter = [tkInteger, tkChar, tkEnumeration, tkFloat, tkSet, tkMethod, tkSString, tkLString, tkAString, tkWString, tkVariant, tkArray, tkRecord, tkInterface, tkClass, tkObject, tkWChar, tkBool, tkInt64, tkQWord, tkDynArray, tkInterfaceRaw, tkProcVar, tkUString, tkUChar, tkHelper]
Indent = 10 Indent = 10

45
src/ce_dfmt.pas
View File

@ -12,7 +12,7 @@ uses
type type
DfmtEol = (cr, lf, crlf); DfmtEol = (cr, lf, crlf);
DfmtIdentstyle = (tab, space); DfmtIndentstyle = (tab, space);
DfmtBraceStyle = (allman, otbs, stroustrup); DfmtBraceStyle = (allman, otbs, stroustrup);
// wraps dfmt options to build the command line with ease // wraps dfmt options to build the command line with ease
@ -20,7 +20,7 @@ type
TCEDmtWrapper = class(TWritableLfmTextComponent) TCEDmtWrapper = class(TWritableLfmTextComponent)
private private
fEol: DfmtEol; fEol: DfmtEol;
fTabStyle: DfmtIdentstyle; fTabStyle: DfmtIndentstyle;
fIndentSize: integer; fIndentSize: integer;
fTabWidth: integer; fTabWidth: integer;
fHardLLen: integer; fHardLLen: integer;
@ -34,14 +34,17 @@ type
procedure setHardLLen(value: integer); procedure setHardLLen(value: integer);
procedure setTabWidth(value: integer); procedure setTabWidth(value: integer);
procedure setIndentSize(value: integer); procedure setIndentSize(value: integer);
procedure setEol(value: DfmtEol);
procedure setBraceStyle(value: DfmtBraceStyle);
procedure setIndentStyle(value: DfmtIndentstyle);
published published
property endOfline: DfmtEol read fEol write fEol default lf; property endOfline: DfmtEol read fEol write setEol default lf;
property identationStyle: DfmtIdentstyle read fTabStyle write fTabStyle default space; property indentationStyle: DfmtIndentstyle read fTabStyle write setIndentStyle default space;
property identSize: integer read fIndentSize write fIndentSize default 4; property indentSize: integer read fIndentSize write fIndentSize default 4;
property tabWidth: integer read fTabWidth write fTabWidth default 8; property tabWidth: integer read fTabWidth write fTabWidth default 8;
property hardLineLen: integer read fHardLLen write fHardLLen default 120; property hardLineLen: integer read fHardLLen write fHardLLen default 120;
property softLineLen: integer read fSoftLLen write fSoftLLen default 80; property softLineLen: integer read fSoftLLen write fSoftLLen default 80;
property braceStyle: DfmtBraceStyle read fBraceStyle write fBraceStyle default allman; property braceStyle: DfmtBraceStyle read fBraceStyle write setBraceStyle default allman;
property spaceAfterCast: boolean read fSpaceCast write fSpaceCast default true; property spaceAfterCast: boolean read fSpaceCast write fSpaceCast default true;
property spaceAfterImport: boolean read fSpaceSelImp write fSpaceSelImp default true; property spaceAfterImport: boolean read fSpaceSelImp write fSpaceSelImp default true;
property splitOpAtPrevLine: boolean read fSplitOp write fSplitOp default true; property splitOpAtPrevLine: boolean read fSplitOp write fSplitOp default true;
@ -116,7 +119,7 @@ constructor TCEDmtWrapper.create(AOwner: TComponent);
begin begin
inherited; inherited;
fEol := lf; fEol := lf;
fTabStyle := DfmtIdentstyle.space; fTabStyle := DfmtIndentstyle.space;
fIndentSize := 4; fIndentSize := 4;
fTabWidth := 8; fTabWidth := 8;
fHardLLen := 120; fHardLLen := 120;
@ -172,6 +175,28 @@ begin
value := 8; value := 8;
fIndentSize := value; fIndentSize := value;
end; end;
procedure TCEDmtWrapper.setEol(value: DfmtEol);
begin
if not (value in [DfmtEol.cr, DfmtEol.lf, DfmtEol.crlf]) then
value := DfmtEol.lf;
fEol:=value;
end;
procedure TCEDmtWrapper.setBraceStyle(value: DfmtBraceStyle);
begin
if not (value in [DfmtBraceStyle.allman, DfmtBraceStyle.otbs,
DfmtBraceStyle.stroustrup]) then
value := DfmtBraceStyle.allman;
fBraceStyle:=value;
end;
procedure TCEDmtWrapper.setIndentStyle(value: DfmtIndentstyle);
begin
if not (value in [DfmtIndentstyle.space, DfmtIndentstyle.tab]) then
value := DfmtIndentstyle.space;
fTabStyle:=value;
end;
{$ENDREGION} {$ENDREGION}
{$REGION ICEMultiDocObserver ---------------------------------------------------} {$REGION ICEMultiDocObserver ---------------------------------------------------}
@ -204,14 +229,14 @@ procedure TCEDmtWrapper.getParameters(str: TStrings);
const const
eol: array[DfmtEol] of string = ('cr', 'lf', 'crlf'); eol: array[DfmtEol] of string = ('cr', 'lf', 'crlf');
falsetrue: array[boolean] of string = ('false', 'true'); falsetrue: array[boolean] of string = ('false', 'true');
idtstyle: array[DfmtIdentstyle] of string = ('tab', 'space'); idtstyle: array[DfmtIndentstyle] of string = ('tab', 'space');
brc: array[DfmtBraceStyle] of string = ('allman', 'otbs', 'stroustrup'); brc: array[DfmtBraceStyle] of string = ('allman', 'otbs', 'stroustrup');
begin begin
str.Add('--end_of_line=' + eol[endOfline]); str.Add('--end_of_line=' + eol[endOfline]);
str.Add('--max_line_length=' + intToStr(hardLineLen)); str.Add('--max_line_length=' + intToStr(hardLineLen));
str.Add('--soft_max_line_length=' + intToStr(softLineLen)); str.Add('--soft_max_line_length=' + intToStr(softLineLen));
str.Add('--indent_size=' + intToStr(identSize)); str.Add('--indent_size=' + intToStr(indentSize));
str.Add('--indent_style=' + idtstyle[identationStyle]); str.Add('--indent_style=' + idtstyle[indentationStyle]);
str.Add('--tab_width=' + intToStr(tabWidth)); str.Add('--tab_width=' + intToStr(tabWidth));
str.Add('--brace_style=' + brc[braceStyle]); str.Add('--brace_style=' + brc[braceStyle]);
str.Add('--split_operator_at_line_end=' + falsetrue[splitOpAtPrevLine]); str.Add('--split_operator_at_line_end=' + falsetrue[splitOpAtPrevLine]);