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

Stop directly accessing top indent token 

Accessing the top indent token without using the topIs* () methods is
unsafe and can lead to range violations.
This commit is contained in:
Laurent Tréguier 2018-10-09 11:28:51 +02:00
parent c84db53c7c
commit 72dd6e83b3
No known key found for this signature in database
GPG Key ID: 09530BFFC32D4A69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dfmt/formatter.d
View File

@ -207,7 +207,7 @@ private:
} }
else if (currentIs(tok!"with")) else if (currentIs(tok!"with"))
{ {
if (indents.length == 0 || (indents.top != tok!"switch" && indents.top != tok!"with")) if (indents.length == 0 || !indents.topIsOneOf(tok!"switch", tok!"with"))
indents.push(tok!"with"); indents.push(tok!"with");
writeToken(); writeToken();
write(" "); write(" ");
@ -1552,7 +1552,7 @@ private:
else else
{ {
if (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}", if (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}",
tok!";") && indents.top != tok!";")) tok!";") && !indents.topIs(tok!";")))
indents.popTempIndents(); indents.popTempIndents();
indentLevel = indents.indentLevel; indentLevel = indents.indentLevel;
} }