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

Merge pull request #290 from stefan-koch-sociomantic/safp 

add --space_before_function_parameters
This commit is contained in:
Richard Andrew Cattermole 2017-10-12 21:34:51 +13:00 committed by GitHub
parent 87fd168e06 02ba81333e
commit 02a735cb0c
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dfmt/config.d
View File

@ -44,6 +44,8 @@ struct Config
/// ///
OptionalBoolean dfmt_space_after_keywords; OptionalBoolean dfmt_space_after_keywords;
/// ///
OptionalBoolean dfmt_space_before_function_parameters;
///
OptionalBoolean dfmt_split_operator_at_line_end; OptionalBoolean dfmt_split_operator_at_line_end;
/// ///
OptionalBoolean dfmt_selective_import_space; OptionalBoolean dfmt_selective_import_space;
@ -72,6 +74,7 @@ struct Config
dfmt_soft_max_line_length = 80; dfmt_soft_max_line_length = 80;
dfmt_space_after_cast = OptionalBoolean.t; dfmt_space_after_cast = OptionalBoolean.t;
dfmt_space_after_keywords = OptionalBoolean.t; dfmt_space_after_keywords = OptionalBoolean.t;
dfmt_space_before_function_parameters = OptionalBoolean.f;
dfmt_split_operator_at_line_end = OptionalBoolean.f; dfmt_split_operator_at_line_end = OptionalBoolean.f;
dfmt_selective_import_space = OptionalBoolean.t; dfmt_selective_import_space = OptionalBoolean.t;
dfmt_compact_labeled_statements = OptionalBoolean.t; dfmt_compact_labeled_statements = OptionalBoolean.t;

2
src/dfmt/formatter.d
View File

@ -281,6 +281,8 @@ private:
{ {
writeToken(); writeToken();
if (index < tokens.length && (currentIs(tok!"identifier") if (index < tokens.length && (currentIs(tok!"identifier")
|| ( ( isBasicType(peekBack().type) || peekBackIs(tok!"identifier") ) &&
currentIs(tok!("(")) && config.dfmt_space_before_function_parameters)
|| isBasicType(current.type) || currentIs(tok!"@") || currentIs(tok!"if") || isBasicType(current.type) || currentIs(tok!"@") || currentIs(tok!"if")
|| isNumberLiteral(tokens[index].type) || (inAsm || isNumberLiteral(tokens[index].type) || (inAsm
&& peekBack2Is(tok!";") && currentIs(tok!"[")))) && peekBack2Is(tok!";") && currentIs(tok!"["))))

5
src/dfmt/main.d
View File

@ -48,6 +48,9 @@ else
case "space_after_cast": case "space_after_cast":
optConfig.dfmt_space_after_cast = optVal; optConfig.dfmt_space_after_cast = optVal;
break; break;
case "space_before_function_parameters":
optConfig.dfmt_space_before_function_parameters = optVal;
break;
case "split_operator_at_line_end": case "split_operator_at_line_end":
optConfig.dfmt_split_operator_at_line_end = optVal; optConfig.dfmt_split_operator_at_line_end = optVal;
break; break;
@ -80,6 +83,7 @@ else
"outdent_attributes", &handleBooleans, "outdent_attributes", &handleBooleans,
"space_after_cast", &handleBooleans, "space_after_cast", &handleBooleans,
"selective_import_space", &handleBooleans, "selective_import_space", &handleBooleans,
"space_before_function_parameters", &handleBooleans,
"split_operator_at_line_end", &handleBooleans, "split_operator_at_line_end", &handleBooleans,
"compact_labeled_statements", &handleBooleans, "compact_labeled_statements", &handleBooleans,
"tab_width", &optConfig.tab_width, "tab_width", &optConfig.tab_width,
@ -271,6 +275,7 @@ Formatting Options:
--max_line_length --max_line_length
--outdent_attributes --outdent_attributes
--space_after_cast --space_after_cast
--space_before_function_parameters
--selective_import_space --selective_import_space
--split_operator_at_line_end --split_operator_at_line_end
--compact_labeled_statements --compact_labeled_statements