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

Add index validity checks to the left paren/bracket code. Fixes #367. (#368) 

Add index validity checks to the left paren/bracket code. Fixes #367.
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
Brian Schott 2018-09-05 16:01:27 -07:00 committed by The Dlang Bot
parent 56097fd106
commit ae76778801
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dfmt/formatter.d
View File

@ -557,6 +557,10 @@ private:
writeToken(); writeToken();
if (p == tok!"(") if (p == tok!"(")
{ {
// If the file starts with an open paren, just give up. This isn't
// valid D code.
if (index < 2)
return;
if (isBlockHeaderToken(tokens[index - 2].type)) if (isBlockHeaderToken(tokens[index - 2].type))
indents.push(tok!")"); indents.push(tok!")");
else else
@ -564,6 +568,9 @@ private:
spaceAfterParens = true; spaceAfterParens = true;
parenDepth++; parenDepth++;
} }
// No heuristics apply if we can't look before the opening paren/bracket
if (index < 1)
return;
immutable bool arrayInitializerStart = p == tok!"[" && linebreakHints.length != 0 immutable bool arrayInitializerStart = p == tok!"[" && linebreakHints.length != 0
&& astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index);
if (arrayInitializerStart) if (arrayInitializerStart)