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

Fix #223

This commit is contained in:
Hackerpilot 2016-01-22 01:51:44 -08:00
parent 08c2d0c5e8
commit ee8fcd41f4
19 changed files with 77 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dfmt/formatter.d
View File

@ -264,7 +264,7 @@ private:
|| isBasicType(current.type) || currentIs(tok!"@")
|| currentIs(tok!"if")
|| isNumberLiteral(tokens[index].type) || (inAsm
&& peekBack2Is(tok!";") && currentIs(tok!"["))))
&& peekBack2Is(tok!";") && currentIs(tok!"["))))
{
write(" ");
}
@ -493,7 +493,10 @@ private:
writeToken();
if (p == tok!"(")
{
indents.push(p);
if (isBlockHeaderToken(tokens[index - 2].type))
indents.push(tok!")");
else
indents.push(p);
spaceAfterParens = true;
parenDepth++;
}
@ -527,9 +530,9 @@ private:
body
{
parenDepth--;
if (parenDepth == 0 && indents.topIs(tok!"!"))
indents.pop();
indents.popWrapIndents();
while (indents.topIsOneOf(tok!"!", tok!")"))
indents.pop();
if (indents.topIs(tok!"("))
indents.pop();
@ -773,7 +776,7 @@ private:
write("}");
if (index + 1 < tokens.length
&& astInformation.doubleNewlineLocations.canFindIndex(
tokens[index].index) && !peekIs(tok!"}")
tokens[index].index) && !peekIs(tok!"}")
&& !peekIs(tok!";") && !peekIs(tok!"comment", false))
{
simpleNewline();
@ -1225,7 +1228,7 @@ private:
if (niBraceDepth > 0 && !peekBackIsSlashSlash() && hasCurrent
&& tokens[index].type == tok!"}"
&& !assumeSorted(astInformation.funLitEndLocations).equalRange(
tokens[index].index).empty)
tokens[index].index).empty)
{
write(" ");
return;

6
src/dfmt/globmatch_editorconfig.d
View File

@ -11,9 +11,9 @@ import std.path : filenameCharCmp, isDirSeparator;
// * changes meaning to match all characters except '/'
// ** added to take over the old meaning of *
bool globMatchEditorConfig(CaseSensitive cs = CaseSensitive.osDefault, C, Range)(
Range path, const(C)[] pattern) @safe pure nothrow if (isForwardRange!Range
&& isSomeChar!(ElementEncodingType!Range) && isSomeChar!C
&& is(Unqual!C == Unqual!(ElementEncodingType!Range)))
Range path, const(C)[] pattern) @safe pure nothrow
if (isForwardRange!Range && isSomeChar!(ElementEncodingType!Range)
&& isSomeChar!C && is(Unqual!C == Unqual!(ElementEncodingType!Range)))
in
{
// Verify that pattern[] is valid

34
src/dfmt/indentation.d
View File

@ -13,7 +13,7 @@ import dparse.lexer;
bool isWrapIndent(IdType type) pure nothrow @nogc @safe
{
return type != tok!"{" && type != tok!"case" && type != tok!"@"
&& type != tok!"]" && type != tok!"(" && isOperator(type);
&& type != tok!"]" && type != tok!"(" && type != tok!")" && isOperator(type);
}
/**
@ -21,7 +21,7 @@ bool isWrapIndent(IdType type) pure nothrow @nogc @safe
*/
bool isTempIndent(IdType type) pure nothrow @nogc @safe
{
return type != tok!"{" && type != tok!"case" && type != tok!"@";
return type != tok!")" && type != tok!"{" && type != tok!"case" && type != tok!"@";
}
/**
@ -175,29 +175,29 @@ private:
int parenCount;
foreach (i; 0 .. j)
{
immutable int pc = (arr[i] == tok!"!" || arr[i] == tok!"(" || arr[i] == tok!")") ? parenCount + 1
: parenCount;
if ((isWrapIndent(arr[i]) || arr[i] == tok!"(") && parenCount > 1)
{
parenCount = pc;
continue;
}
if (i + 1 < index)
{
if (arr[i] == tok!"(")
parenCount++;
else if (arr[i] == tok!"]")
if (arr[i] == tok!"]")
continue;
else
immutable currentIsNonWrapTemp = !isWrapIndent(arr[i])
&& isTempIndent(arr[i]) && arr[i] != tok!")" && arr[i] != tok!"!";
if (currentIsNonWrapTemp && (arr[i + 1] == tok!"switch"
|| arr[i + 1] == tok!"{" || arr[i + 1] == tok!")"))
{
if (isWrapIndent(arr[i]) && parenCount > 0)
{
parenCount = 0;
continue;
}
parenCount = 0;
}
immutable currentIsNonWrapTemp = !isWrapIndent(arr[i]) && isTempIndent(arr[i]);
immutable nextIsParenOrSwitch = arr[i + 1] == tok!"("
|| arr[i + 1] == tok!"switch" || arr[i + 1] == tok!"{";
if (currentIsNonWrapTemp && nextIsParenOrSwitch)
parenCount = pc;
continue;
}
}
if (arr[i] == tok!"!")
size++;
parenCount = pc;
size++;
}
return size;

3
src/dfmt/wrapping.d
View File

@ -153,8 +153,7 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens,
return genRetVal(current.breaks, index);
}
validMoves!(typeof(open))(open, tokens[0 .. tokensEnd],
depths[0 .. tokensEnd], current.breaks, config, currentLineLength,
indentLevel);
depths[0 .. tokensEnd], current.breaks, config, currentLineLength, indentLevel);
}
if (open.empty)
return genRetVal(lowest.breaks, index);

2
tests/allman/attribute_constraint.d.ref
View File

@ -8,7 +8,7 @@ struct SomeStructName
{
void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property
if (someThingsAreTrue!AAAAAAAA && long_condition
&& is(some < elaborate && expression))
&& is(some < elaborate && expression))
{
}
}

4
tests/allman/issue0119.d.ref
View File

@ -18,8 +18,8 @@ unittest
callFunc({
int i = 10;
foo(alpha_longVarName, bravo_longVarName, charlie_longVarName,
delta_longVarName, echo_longVarName, foxtrot_longVarName,
golf_longVarName, echo_longVarName);
delta_longVarName, echo_longVarName, foxtrot_longVarName,
golf_longVarName, echo_longVarName);
doStuff(withThings, andOtherStuff);
return i;
}, more_stuff);

12
tests/allman/issue0186.d.ref
View File

@ -8,12 +8,12 @@ void main()
static if (true)
{
if (true && {
functionName();
functionName();
functionName();
functionName();
return true;
}())
functionName();
functionName();
functionName();
functionName();
return true;
}())
{
}

2
tests/allman/issue0215a.d.ref
View File

@ -10,7 +10,7 @@ unittest
bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
Three charlie, double delta)
if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
&& foxtrot && golf && hotel && india && juliet)
&& foxtrot && golf && hotel && india && juliet)
{
}

2
tests/allman/issue0215d.d.ref
View File

@ -11,7 +11,7 @@ unittest
bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
Three charlie, double delta)
if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
&& foxtrot && golf && hotel && india && juliet)
&& foxtrot && golf && hotel && india && juliet)
{
}

8
tests/allman/issue0223.d.ref Normal file
View File

@ -0,0 +1,8 @@
unittest
{
if (info > 0)
throw new ExceptionWithLongName(
std.string.format(
"During the LU factorization, it was found that the " ~ "%sth diagonal value is exactly zero.",
info), file, line);
}

2
tests/allman/wrapping1.d.ref
View File

@ -4,6 +4,6 @@ void main(string[] args)
{
addErrorMessage(line, column, KEY,
"Expression %s is true: already checked on line %d.".format(
expressions[prevLocation].formatted, expressions[prevLocation].line));
expressions[prevLocation].formatted, expressions[prevLocation].line));
}
}

8
tests/issue0223.d Normal file
View File

@ -0,0 +1,8 @@
unittest
{
if (info > 0)
throw new ExceptionWithLongName(
std.string.format(
"During the LU factorization, it was found that the " ~ "%sth diagonal value is exactly zero.",
info), file, line);
}

2
tests/otbs/attribute_constraint.d.ref
View File

@ -4,7 +4,7 @@ struct SomeStructName {
static if (condition) {
void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property
if (someThingsAreTrue!AAAAAAAA && long_condition
&& is(some < elaborate && expression)) {
&& is(some < elaborate && expression)) {
}
}
}

4
tests/otbs/issue0119.d.ref
View File

@ -17,8 +17,8 @@ unittest {
callFunc({
int i = 10;
foo(alpha_longVarName, bravo_longVarName, charlie_longVarName,
delta_longVarName, echo_longVarName, foxtrot_longVarName,
golf_longVarName, echo_longVarName);
delta_longVarName, echo_longVarName, foxtrot_longVarName,
golf_longVarName, echo_longVarName);
doStuff(withThings, andOtherStuff);
return i;
}, more_stuff);

12
tests/otbs/issue0186.d.ref
View File

@ -5,12 +5,12 @@ void functionName() {
void main() {
static if (true) {
if (true && {
functionName();
functionName();
functionName();
functionName();
return true;
}()) {
functionName();
functionName();
functionName();
functionName();
return true;
}()) {
} else {

2
tests/otbs/issue0215a.d.ref
View File

@ -8,7 +8,7 @@ unittest {
bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
Three charlie, double delta)
if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
&& foxtrot && golf && hotel && india && juliet) {
&& foxtrot && golf && hotel && india && juliet) {
}
}

2
tests/otbs/issue0215d.d.ref
View File

@ -9,7 +9,7 @@ unittest {
bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
Three charlie, double delta)
if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
&& foxtrot && golf && hotel && india && juliet) {
&& foxtrot && golf && hotel && india && juliet) {
}
}

7
tests/otbs/issue0223.d.ref Normal file
View File

@ -0,0 +1,7 @@
unittest {
if (info > 0)
throw new ExceptionWithLongName(
std.string.format(
"During the LU factorization, it was found that the " ~ "%sth diagonal value is exactly zero.",
info), file, line);
}

2
tests/otbs/wrapping1.d.ref
View File

@ -2,6 +2,6 @@ void main(string[] args) {
if (prevLocation != size_t.max) {
addErrorMessage(line, column, KEY,
"Expression %s is true: already checked on line %d.".format(
expressions[prevLocation].formatted, expressions[prevLocation].line));
expressions[prevLocation].formatted, expressions[prevLocation].line));
}
}