forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #31

This commit is contained in:
Hackerpilot 2015-04-20 00:07:33 -07:00
parent 70bc25a856
commit 87866f8fcd
14 changed files with 108 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.editorconfig
View File

@ -3,6 +3,11 @@ trim_trailing_whitespace = true
end_of_line = lf
insert_final_newline = true
[*.sh]
tab_width = 4
indent_size = 4
indent_style = tab
[*.d]
dfmt_align_switch_statements = true
dfmt_brace_style = allman

2
README.md
View File

@ -48,7 +48,7 @@ dfmt_outdent_labels (Not yet implemented) | `true`, `false` | `true` | Decrease
dfmt_align_switch_statements (Not yet implemented) | `true`, `false` | `true` | Align labels, cases, and defaults with their enclosing switch
dfmt_outdent_attributes (Not yet implemented) | `true`, `false` | `true` | Decrease the indentation level of attributes
dfmt_split_operator_at_line_end (Not yet implemented) | `true`, `false` | `false` | Place operators on the end of the previous line when splitting lines
dfmt_space_after_cast (Not yet implemented) | `true`, `false` | `false` | Insert space after the closing paren of a `cast` expression
dfmt_space_after_cast | `true`, `false` | `false` | Insert space after the closing paren of a `cast` expression
dfmt_space_after_keywords (Not yet implemented) | `true`, `false` | `true` | Insert space after `if`, `while`, `foreach`, etc, and before the `(`
## Terminology

24
src/dfmt/config.d
View File

@ -23,21 +23,21 @@ enum BraceStyle
struct Config
{
///
OptionalBoolean dfmt_align_switch_statements = OptionalBoolean.t;
OptionalBoolean dfmt_align_switch_statements;
///
BraceStyle dfmt_brace_style = BraceStyle.allman;
BraceStyle dfmt_brace_style;
///
OptionalBoolean dfmt_outdent_attributes = OptionalBoolean.t;
OptionalBoolean dfmt_outdent_attributes;
///
OptionalBoolean dfmt_outdent_labels = OptionalBoolean.t;
OptionalBoolean dfmt_outdent_labels;
///
int dfmt_soft_max_line_length = 80;
int dfmt_soft_max_line_length = -1;
///
OptionalBoolean dfmt_space_after_cast = OptionalBoolean.t;
OptionalBoolean dfmt_space_after_cast;
///
OptionalBoolean dfmt_space_after_keywords = OptionalBoolean.t;
OptionalBoolean dfmt_space_after_keywords;
///
OptionalBoolean dfmt_split_operator_at_line_end = OptionalBoolean.f;
OptionalBoolean dfmt_split_operator_at_line_end;
mixin StandardEditorConfigFields;
@ -54,6 +54,14 @@ struct Config
indent_size = 4;
tab_width = 4;
max_line_length = 120;
dfmt_align_switch_statements = OptionalBoolean.t;
dfmt_brace_style = BraceStyle.allman;
dfmt_outdent_attributes = OptionalBoolean.t;
dfmt_outdent_labels = OptionalBoolean.t;
dfmt_soft_max_line_length = 80;
dfmt_space_after_cast = OptionalBoolean.t;
dfmt_space_after_keywords = OptionalBoolean.t;
dfmt_split_operator_at_line_end = OptionalBoolean.f;
}
/**

11
src/dfmt/formatter.d
View File

@ -650,6 +650,8 @@ private:
void formatKeyword()
{
import dfmt.editorconfig : OptionalBoolean;
switch (current.type)
{
case tok!"default":
@ -657,6 +659,8 @@ private:
break;
case tok!"cast":
writeToken();
if (currentIs(tok!"("))
writeParens(config.dfmt_space_after_cast == OptionalBoolean.t);
break;
case tok!"try":
if (peekIs(tok!"{"))
@ -1062,12 +1066,15 @@ private:
body
{
immutable int depth = parenDepth;
parenDepth = 0;
do
{
formatStep();
spaceAfterParens = spaceAfter;
formatStep();
}
while (index < tokens.length && parenDepth > depth);
while (index < tokens.length && parenDepth > 0);
parenDepth = depth;
spaceAfterParens = spaceAfter;
}
void indent()

37
src/dfmt/main.d
View File

@ -24,6 +24,30 @@ else
Config optConfig;
optConfig.pattern = "*.d";
bool showHelp;
void handleBooleans(string option, string value)
{
import dfmt.editorconfig : OptionalBoolean;
import std.exception : enforce;
enforce(value == "true" || value == "false", "Invalid argument");
switch (option)
{
case "outdent_attributes":
optConfig.dfmt_outdent_attributes = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
break;
case "outdent_labels":
optConfig.dfmt_outdent_labels = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
break;
case "space_after_cast":
optConfig.dfmt_space_after_cast = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
break;
case "split_operator_at_line_end":
optConfig.dfmt_split_operator_at_line_end = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
break;
default: assert(false, "Invalid command-line switch");
}
}
getopt(args,
"align_switch_statements", &optConfig.dfmt_align_switch_statements,
"brace_style", &optConfig.dfmt_brace_style,
@ -34,10 +58,10 @@ else
"inplace", &inplace,
"max_line_length", &optConfig.max_line_length,
"max_line_length", &optConfig.max_line_length,
"outdent_attributes", &optConfig.dfmt_outdent_attributes,
"outdent_labels", &optConfig.dfmt_outdent_labels,
"space_after_cast", &optConfig.dfmt_space_after_cast,
"split_operator_at_line_end", &optConfig.dfmt_split_operator_at_line_end,
"outdent_attributes", &handleBooleans,
"outdent_labels", &handleBooleans,
"space_after_cast", &handleBooleans,
"split_operator_at_line_end", &handleBooleans,
"tab_width", &optConfig.tab_width);
if (showHelp)
@ -132,11 +156,6 @@ Formatting Options:
}
private string createFilePath(bool readFromStdin, string fileName)
//out (result)
//{
// stderr.writeln(__FUNCTION__, ": ", result);
//}
//body
{
import std.file : getcwd;
import std.path : isRooted;

0
tests/allman/.d.ref Normal file
View File

6
tests/allman/issue0031.d.ref Normal file
View File

@ -0,0 +1,6 @@
import std.stdio : writeln;
void main()
{
writeln(cast(dchar)uint.max);
}

9
tests/gen_expected.sh
View File

@ -1,5 +1,10 @@
dfmt --braces=allman $1.d > allman/$1.d.ref
dfmt --braces=otbs $1.d > otbs/$1.d.ref
argsFile=$1.args
if [ -e ${argsFile} ]; then
args=$(cat ${argsFile})
fi
echo ${args}
dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref
dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref
echo "------------------"
echo "allman:"

1
tests/issue0031.args Normal file
View File

@ -0,0 +1 @@
--space_after_cast=false

6
tests/issue0031.d Normal file
View File

@ -0,0 +1,6 @@
import std.stdio : writeln;
void main()
{
writeln(cast(dchar) uint.max);
}

0
tests/otbs/.d.ref Normal file
View File

5
tests/otbs/issue0031.d.ref Normal file
View File

@ -0,0 +1,5 @@
import std.stdio : writeln;
void main() {
writeln(cast(dchar)uint.max);
}

16
tests/test Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env bash
set -e
for braceStyle in allman otbs
do
for source in *.d
do
echo "${source}.ref" "${braceStyle}/${source}.out"
argsFile=$(basename ${source}).args
if [ -e ${argsFile} ]; then
args=$(cat ${argsFile})
fi
../bin/dfmt --brace_style=${braceStyle} ${args} "${source}" > "${braceStyle}/${source}.out"
diff -u "${braceStyle}/${source}.ref" "${braceStyle}/${source}.out"
done
done

8
tests/test.sh
View File

@ -6,7 +6,13 @@ do
for source in *.d
do
echo "${source}.ref" "${braceStyle}/${source}.out"
../bin/dfmt --brace_style=${braceStyle} "${source}" > "${braceStyle}/${source}.out"
argsFile=$(basename ${source} .d).args
if [ -e ${argsFile} ]; then
args=$(cat ${argsFile})
else
args=
fi
../bin/dfmt --brace_style=${braceStyle} ${args} "${source}" > "${braceStyle}/${source}.out"
diff -u "${braceStyle}/${source}.ref" "${braceStyle}/${source}.out"
done
done