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

dfmt commander, added support for template constraint style

This commit is contained in:
Basile Burg 2016-03-13 13:18:36 +01:00
parent 6d60a3118c
commit 83338db48c
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ce_dfmt.pas
View File

@ -14,7 +14,10 @@ type
DfmtEol = (cr, lf, crlf); DfmtEol = (cr, lf, crlf);
DfmtIndentstyle = (tab, space); DfmtIndentstyle = (tab, space);
DfmtBraceStyle = (allman, otbs, stroustrup); DfmtBraceStyle = (allman, otbs, stroustrup);
DfmtConstraint = (condNewLineIndent, condNewLine, alwaysNewLine, alwaysNewLineIndent);
type
// wraps dfmt options to build the command line with ease // wraps dfmt options to build the command line with ease
// and allows to save the options between session. // and allows to save the options between session.
TCEDmtWrapper = class(TWritableLfmTextComponent) TCEDmtWrapper = class(TWritableLfmTextComponent)
@ -30,6 +33,7 @@ type
fSplitOp: boolean; fSplitOp: boolean;
fCompactLbl: boolean; fCompactLbl: boolean;
fSpaceSelImp: boolean; fSpaceSelImp: boolean;
fConstraints: DfmtConstraint;
procedure setSoftLLen(value: integer); procedure setSoftLLen(value: integer);
procedure setHardLLen(value: integer); procedure setHardLLen(value: integer);
procedure setTabWidth(value: integer); procedure setTabWidth(value: integer);
@ -37,6 +41,7 @@ type
procedure setEol(value: DfmtEol); procedure setEol(value: DfmtEol);
procedure setBraceStyle(value: DfmtBraceStyle); procedure setBraceStyle(value: DfmtBraceStyle);
procedure setIndentStyle(value: DfmtIndentstyle); procedure setIndentStyle(value: DfmtIndentstyle);
procedure setConstraintsStyle(value: DfmtConstraint);
published published
property endOfline: DfmtEol read fEol write setEol default lf; property endOfline: DfmtEol read fEol write setEol default lf;
property indentationStyle: DfmtIndentstyle read fTabStyle write setIndentStyle default space; property indentationStyle: DfmtIndentstyle read fTabStyle write setIndentStyle default space;
@ -49,6 +54,7 @@ type
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;
property compactLabeledStatements: boolean read fCompactLbl write fCompactLbl default true; property compactLabeledStatements: boolean read fCompactLbl write fCompactLbl default true;
property constraintsStyle: DfmtConstraint read fConstraints write setConstraintsStyle default condNewLineIndent;
public public
constructor create(AOwner: TComponent); override; constructor create(AOwner: TComponent); override;
procedure getParameters(str: TStrings); procedure getParameters(str: TStrings);
@ -129,6 +135,7 @@ begin
fSpaceSelImp := true; fSpaceSelImp := true;
fSplitOp := true; fSplitOp := true;
fCompactLbl := true; fCompactLbl := true;
fConstraints := DfmtConstraint.condNewLineIndent;
end; end;
procedure TCEDfmtWidget.dfmtOptionEditorEditorFilter(Sender: TObject; procedure TCEDfmtWidget.dfmtOptionEditorEditorFilter(Sender: TObject;
@ -197,6 +204,14 @@ begin
value := DfmtIndentstyle.space; value := DfmtIndentstyle.space;
fTabStyle:=value; fTabStyle:=value;
end; end;
procedure TCEDmtWrapper.setConstraintsStyle(value: DfmtConstraint);
begin
if not (value in [DfmtConstraint.alwaysNewLine, DfmtConstraint.alwaysNewLineIndent,
DfmtConstraint.condNewLine, DfmtConstraint.condNewLineIndent]) then
value := DfmtConstraint.condNewLineIndent;
fConstraints:=value;
end;
{$ENDREGION} {$ENDREGION}
{$REGION ICEMultiDocObserver ---------------------------------------------------} {$REGION ICEMultiDocObserver ---------------------------------------------------}
@ -231,6 +246,8 @@ const
falsetrue: array[boolean] of string = ('false', 'true'); falsetrue: array[boolean] of string = ('false', 'true');
idtstyle: array[DfmtIndentstyle] 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');
cts: array[DfmtConstraint] of string = ('conditional_newline_indent',
'conditional_newline', 'always_newline', 'always_newline_indent');
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));
@ -243,6 +260,7 @@ begin
str.Add('--space_after_cast=' + falsetrue[spaceAfterCast]); str.Add('--space_after_cast=' + falsetrue[spaceAfterCast]);
str.Add('--selective_import_space=' + falsetrue[spaceAfterImport]); str.Add('--selective_import_space=' + falsetrue[spaceAfterImport]);
str.Add('--compact_labeled_statements=' + falsetrue[compactLabeledStatements]); str.Add('--compact_labeled_statements=' + falsetrue[compactLabeledStatements]);
str.Add('--template_constraint_style=' + cts[fConstraints]);
end; end;
procedure TCEDfmtWidget.doApply(sender: TObject); procedure TCEDfmtWidget.doApply(sender: TObject);