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

Line wrapping improvements

This commit is contained in:
Hackerpilot 2015-02-01 02:22:27 -08:00
parent 41854aaeb6
commit e90b84dcde
2 changed files with 98 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdparse

@ -1 +1 @@
Subproject commit bce47174cc2ea6cfd26d007a9c41108e4fb28f0e Subproject commit f73bed9279602a228933b21156d8f1f2ec5e4fdd

149
src/dfmt.d
View File

@ -34,26 +34,21 @@ import std.d.formatter;
import std.d.ast; import std.d.ast;
import std.array; import std.array;
immutable USAGE = "usage: %s [--inplace] [<path>...]
Formats D code.
--inplace change file in-place instead of outputing to stdout
(implicit in case of multiple files)
-h, --help display this help and exit
";
version (NoMain) version (NoMain)
{ } { }
else else
int main(string[] args) int main(string[] args)
{ {
import std.getopt; import std.getopt : getopt;
bool inplace = false; bool inplace = false;
bool show_usage = false; bool show_usage = false;
FormatterConfig formatterConfig;
getopt(args, getopt(args,
"help|h", &show_usage, "help|h", &show_usage,
"inplace", &inplace); "inplace", &inplace,
"tabs|t", &formatterConfig.useTabs,
"braces", &formatterConfig.braceStyle);
if (show_usage) if (show_usage)
{ {
import std.path: baseName; import std.path: baseName;
@ -75,11 +70,11 @@ int main(string[] args)
else else
break; break;
} }
format("stdin", buffer, output.lockingTextWriter()); format("stdin", buffer, output.lockingTextWriter(), &formatterConfig);
} }
else else
{ {
import std.file; import std.file : dirEntries, isDir, SpanMode;
if (args.length >= 2) if (args.length >= 2)
inplace = true; inplace = true;
while (args.length > 0) while (args.length > 0)
@ -100,14 +95,27 @@ int main(string[] args)
f.rawRead(buffer); f.rawRead(buffer);
if (inplace) if (inplace)
output = File(path, "w"); output = File(path, "w");
format(path, buffer, output.lockingTextWriter()); format(path, buffer, output.lockingTextWriter(), &formatterConfig);
} }
} }
return 0; return 0;
} }
private:
void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output) immutable USAGE = "usage: %s [--inplace] [<path>...]
Formats D code.
--inplace Change file in-place instead of outputing to stdout
(implicit in case of multiple files)
--tabs | -t Use tabs instead of spaces for indentation
--braces=allman Use Allman indent style (default)
--braces=otbs Use the One True Brace Style
--help | -h Display this help and exit
";
void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output,
FormatterConfig* formatterConfig)
{ {
LexerConfig config; LexerConfig config;
config.stringBehavior = StringBehavior.source; config.stringBehavior = StringBehavior.source;
@ -117,7 +125,6 @@ void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output)
parseConfig.whitespaceBehavior = WhitespaceBehavior.skip; parseConfig.whitespaceBehavior = WhitespaceBehavior.skip;
StringCache cache = StringCache(StringCache.defaultBucketCount); StringCache cache = StringCache(StringCache.defaultBucketCount);
ASTInformation astInformation; ASTInformation astInformation;
FormatterConfig formatterConfig;
auto parseTokens = getTokensForParser(buffer, parseConfig, &cache); auto parseTokens = getTokensForParser(buffer, parseConfig, &cache);
auto mod = parseModule(parseTokens, source_desc); auto mod = parseModule(parseTokens, source_desc);
auto visitor = new FormatVisitor(&astInformation); auto visitor = new FormatVisitor(&astInformation);
@ -125,7 +132,7 @@ void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output)
astInformation.cleanup(); astInformation.cleanup();
auto tokens = byToken(buffer, config, &cache).array(); auto tokens = byToken(buffer, config, &cache).array();
auto tokenFormatter = TokenFormatter!OutputRange(tokens, output, &astInformation, auto tokenFormatter = TokenFormatter!OutputRange(tokens, output, &astInformation,
&formatterConfig); formatterConfig);
tokenFormatter.format(); tokenFormatter.format();
} }
@ -202,11 +209,11 @@ private:
writeToken(); writeToken();
tempIndent = 0; tempIndent = 0;
if (index >= tokens.length) if (index >= tokens.length)
{ {
newline(); newline();
break; break;
} }
if (current.type == tok!"comment") if (current.type == tok!"comment")
break; break;
if (!(t == tok!"import" && current.type == tok!"import")) if (!(t == tok!"import" && current.type == tok!"import"))
write("\n"); write("\n");
@ -247,6 +254,12 @@ private:
} }
else if (current.type == tok!"switch") else if (current.type == tok!"switch")
formatSwitch(); formatSwitch();
else if (current.type == tok!"version" && peekIs(tok!"("))
{
writeToken();
write(" ");
writeParens(false);
}
else if (current.type == tok!"for" || current.type == tok!"foreach" else if (current.type == tok!"for" || current.type == tok!"foreach"
|| current.type == tok!"foreach_reverse" || current.type == tok!"while" || current.type == tok!"foreach_reverse" || current.type == tok!"while"
|| current.type == tok!"if") || current.type == tok!"if")
@ -367,17 +380,14 @@ private:
writeToken(); writeToken();
break; break;
case tok!",": case tok!",":
if (currentLineLength + nextTokenLength() >= config.columnSoftLimit) writeToken();
if (currentLineLength + expressionLength() >= config.columnSoftLimit)
{ {
pushIndent(); pushIndent();
writeToken();
newline(); newline();
} }
else else
{
writeToken();
write(" "); write(" ");
}
break; break;
case tok!"^^": case tok!"^^":
case tok!"^=": case tok!"^=":
@ -438,29 +448,62 @@ private:
{ {
writeToken(); writeToken();
if (index < tokens.length && (current.type == tok!"identifier" if (index < tokens.length && (current.type == tok!"identifier"
|| isKeyword(current.type) || isBasicType(current.type) || isKeyword(current.type) || isBasicType(current.type)
|| current.type == tok!"@")) || current.type == tok!"@"))
{
write(" "); write(" ");
}
} }
else else
assert (false, str(current.type)); assert (false, str(current.type));
} }
/// Pushes a temporary indent level /// Pushes a temporary indent level
void pushIndent() void pushIndent()
{ {
if (tempIndent == 0) if (tempIndent == 0)
tempIndent++; tempIndent++;
} }
/// Pops a temporary indent level /// Pops a temporary indent level
void popIndent() void popIndent()
{ {
if (tempIndent > 0) if (tempIndent > 0)
tempIndent--; tempIndent--;
} }
/// Writes balanced braces size_t expressionLength() const pure @safe @nogc
{
size_t i = index;
size_t l = 0;
int parenDepth = 0;
loop: while (i < tokens.length) switch (tokens[i].type)
{
case tok!"(":
parenDepth++;
l++;
i++;
break;
case tok!")":
parenDepth--;
if (parenDepth == 0)
break loop;
l++;
i++;
break;
case tok!";":
case tok!",":
break loop;
default:
l += tokenLength(i);
if (isBasicType(tokens[i].type) || tokens[i].type == tok!"identifier")
l++;
i++;
}
return l;
}
/// Writes balanced braces
void writeBraces() void writeBraces()
{ {
import std.range : assumeSorted; import std.range : assumeSorted;
@ -486,12 +529,12 @@ private:
} }
else if (current.type == tok!"}") else if (current.type == tok!"}")
{ {
// Silly hack to format enums better. // Silly hack to format enums better.
if (peekBackIs(tok!"identifier")) if (peekBackIs(tok!"identifier"))
newline(); newline();
write("}"); write("}");
depth--; depth--;
if (index < tokens.length-1 && if (index < tokens.length - 1 &&
assumeSorted(astInformation.doubleNewlineLocations) assumeSorted(astInformation.doubleNewlineLocations)
.equalRange(tokens[index].index).length) .equalRange(tokens[index].index).length)
{ {
@ -635,10 +678,11 @@ private:
newline(); newline();
} }
int tokenLength(size_t i) pure @safe @nogc int tokenLength(size_t i) const pure @safe @nogc
{ {
import std.algorithm : countUntil; import std.algorithm : countUntil;
assert (i+1 <= tokens.length);
assert(i + 1 <= tokens.length);
switch (tokens[i].type) switch (tokens[i].type)
{ {
case tok!"identifier": case tok!"identifier":
@ -649,7 +693,8 @@ private:
if (c == -1) if (c == -1)
return cast(int) tokens[i].text.length; return cast(int) tokens[i].text.length;
mixin (generateFixedLengthCases()); mixin (generateFixedLengthCases());
default: return INVALID_TOKEN_LENGTH; default :
return INVALID_TOKEN_LENGTH;
} }
} }
@ -911,21 +956,21 @@ string generateFixedLengthCases()
"finally", "float", "for", "foreach", "foreach_reverse", "function", "finally", "float", "for", "foreach", "foreach_reverse", "function",
"goto", "idouble", "if", "ifloat", "immutable", "import", "in", "inout", "goto", "idouble", "if", "ifloat", "immutable", "import", "in", "inout",
"int", "interface", "invariant", "ireal", "is", "lazy", "long", "macro", "int", "interface", "invariant", "ireal", "is", "lazy", "long", "macro",
"mixin", "module", "new", "nothrow", "null", "out", "override", "package", "mixin", "module", "new", "nothrow", "null", "out", "override",
"pragma", "private", "protected", "public", "pure", "real", "ref", "package", "pragma", "private", "protected", "public", "pure", "real",
"return", "scope", "shared", "short", "static", "struct", "super", "ref", "return", "scope", "shared", "short", "static", "struct", "super",
"switch", "synchronized", "template", "this", "throw", "true", "try", "switch", "synchronized", "template", "this", "throw", "true", "try",
"typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", "union", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong",
"unittest", "ushort", "version", "void", "volatile", "wchar", "while", "union", "unittest", "ushort", "version", "void", "volatile", "wchar",
"with", "__DATE__", "__EOF__", "__FILE__", "__FUNCTION__", "__gshared", "while", "with", "__DATE__", "__EOF__", "__FILE__", "__FUNCTION__",
"__LINE__", "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters",
"__TIME__", "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", "__traits",
"__VERSION__", ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "__vector", "__VENDOR__", "__VERSION__", ",", ".", "..", "...", "/",
"!<>=", "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "/=", "!", "!<", "!<=", "!<>", "!<>=", "!=", "!>", "!>=", "$", "%", "%=",
"*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", "+=", "-", "--", "-=",
"<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", ":", ";", "<", "<<", "<<=", "<=", "<>", "<>=", "=", "==", "=>", ">",
"@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "]", "^", "^=", "^^",
"~="]; "^^=", "{", "|", "|=", "||", "}", "~", "~="];
return fixedLengthTokens.map!(a => format(`case tok!"%s": return %d;`, a, a return fixedLengthTokens.map!(a => format(`case tok!"%s": return %d;`, a,
.length)).join("\n\t"); a.length)).join("\n\t");
} }