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

add some missing hasCurrent checks

This commit is contained in:
WebFreak001 2023-02-25 01:51:50 +01:00
parent dba8c87ebc
commit 68d0e4e7ce
No known key found for this signature in database
GPG Key ID: AEFC88D11109D1AA
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dfmt/formatter.d
View File

@ -247,9 +247,9 @@ private:
else if (currentIs(tok!"return")) else if (currentIs(tok!"return"))
{ {
writeToken(); writeToken();
if (!currentIs(tok!";") && !currentIs(tok!")") && !currentIs(tok!"{") if (hasCurrent && (!currentIs(tok!";") && !currentIs(tok!")") && !currentIs(tok!"{")
&& !currentIs(tok!"in") && !currentIs(tok!"out") && !currentIs(tok!"do") && !currentIs(tok!"in") && !currentIs(tok!"out") && !currentIs(tok!"do")
&& (hasCurrent && tokens[index].text != "body")) && tokens[index].text != "body"))
write(" "); write(" ");
} }
else if (currentIs(tok!"with")) else if (currentIs(tok!"with"))
@ -258,14 +258,14 @@ private:
indents.push(tok!"with"); indents.push(tok!"with");
writeToken(); writeToken();
write(" "); write(" ");
if (currentIs(tok!"(")) if (hasCurrent && currentIs(tok!"("))
writeParens(false); writeParens(false);
if (!currentIs(tok!"switch") && !currentIs(tok!"with") if (hasCurrent && !currentIs(tok!"switch") && !currentIs(tok!"with")
&& !currentIs(tok!"{") && !(currentIs(tok!"final") && peekIs(tok!"switch"))) && !currentIs(tok!"{") && !(currentIs(tok!"final") && peekIs(tok!"switch")))
{ {
newline(); newline();
} }
else if (!currentIs(tok!"{")) else if (hasCurrent && !currentIs(tok!"{"))
write(" "); write(" ");
} }
else if (currentIs(tok!"switch")) else if (currentIs(tok!"switch"))
@ -351,7 +351,7 @@ private:
else if (isBasicType(current.type)) else if (isBasicType(current.type))
{ {
writeToken(); writeToken();
if (currentIs(tok!"identifier") || isKeyword(current.type) || inAsm) if (hasCurrent && (currentIs(tok!"identifier") || isKeyword(current.type) || inAsm))
write(" "); write(" ");
} }
else if (isOperator(current.type)) else if (isOperator(current.type))
@ -1233,7 +1233,7 @@ private:
break; break;
case tok!"cast": case tok!"cast":
writeToken(); writeToken();
if (currentIs(tok!"(")) if (hasCurrent && currentIs(tok!"("))
writeParens(config.dfmt_space_after_cast == OptionalBoolean.t); writeParens(config.dfmt_space_after_cast == OptionalBoolean.t);
break; break;
case tok!"out": case tok!"out":
@ -1245,14 +1245,14 @@ private:
write(" "); write(" ");
} }
writeToken(); writeToken();
if (!currentIs(tok!"{") && !currentIs(tok!"comment")) if (hasCurrent && !currentIs(tok!"{") && !currentIs(tok!"comment"))
write(" "); write(" ");
break; break;
case tok!"try": case tok!"try":
case tok!"finally": case tok!"finally":
indents.push(current.type); indents.push(current.type);
writeToken(); writeToken();
if (!currentIs(tok!"{")) if (hasCurrent && !currentIs(tok!"{"))
newline(); newline();
break; break;
case tok!"identifier": case tok!"identifier":
@ -1277,6 +1277,8 @@ private:
write(" "); write(" ");
} }
writeToken(); writeToken();
if (!hasCurrent)
return;
immutable isFunctionLit = astInformation.funLitStartLocations.canFindIndex( immutable isFunctionLit = astInformation.funLitStartLocations.canFindIndex(
current.index); current.index);
if (isFunctionLit && config.dfmt_brace_style == BraceStyle.allman) if (isFunctionLit && config.dfmt_brace_style == BraceStyle.allman)
@ -1289,12 +1291,12 @@ private:
tok!"}", tok!"=", tok!"&&", tok!"||") && !peekBackIsKeyword()) tok!"}", tok!"=", tok!"&&", tok!"||") && !peekBackIsKeyword())
write(" "); write(" ");
writeToken(); writeToken();
if (!currentIs(tok!"(") && !currentIs(tok!"{") && !currentIs(tok!"comment")) if (hasCurrent && !currentIs(tok!"(") && !currentIs(tok!"{") && !currentIs(tok!"comment"))
write(" "); write(" ");
break; break;
case tok!"case": case tok!"case":
writeToken(); writeToken();
if (!currentIs(tok!";")) if (hasCurrent && !currentIs(tok!";"))
write(" "); write(" ");
break; break;
case tok!"enum": case tok!"enum":
@ -1308,7 +1310,7 @@ private:
write(" "); write(" ");
indents.push(tok!"enum"); indents.push(tok!"enum");
writeToken(); writeToken();
if (!currentIs(tok!":") && !currentIs(tok!"{")) if (hasCurrent && !currentIs(tok!":") && !currentIs(tok!"{"))
write(" "); write(" ");
} }
break; break;
@ -1332,7 +1334,7 @@ private:
goto default; goto default;
case tok!"invariant": case tok!"invariant":
writeToken(); writeToken();
if (currentIs(tok!"(")) if (hasCurrent && currentIs(tok!"("))
write(" "); write(" ");
break; break;
default: default:

1
tests/allman/incomplete_alias.d.ref Normal file
View File

@ -0,0 +1 @@
alias u8 = ubyte

1
tests/incomplete_alias.d Normal file
View File

@ -0,0 +1 @@
alias u8 = ubyte

1
tests/otbs/incomplete_alias.d.ref Normal file
View File

@ -0,0 +1 @@
alias u8 = ubyte