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

move closer to sociomantic spec

This commit is contained in:
Stefan Koch 2017-11-28 14:40:01 +01:00
parent 1acd642eb2
commit 5f1b1479eb
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dfmt/ast_info.d
View File

@ -83,6 +83,20 @@ struct ASTInformation
return bestOrdinal; return bestOrdinal;
} }
/// true if a is closer to t then b
/// with bias towards true
static bool isCloserTo(const string[] a, const string[] b, const string[] t)
{
import std.algorithm : min;
foreach(i;0 .. min(a.length, b.length, t.length))
{
}
return false;
}
bool importStringLess(const Import a, const Import b) const bool importStringLess(const Import a, const Import b) const
{ {
bool result; bool result;
@ -132,13 +146,24 @@ struct ASTInformation
if (i > 0) if (i > 0)
{ {
const prev = sortedImports[i-1]; const prev = sortedImports[i-1];
static if (false)
{
if (prev.importStrings.length < 2 if (prev.importStrings.length < 2
|| imp.importStrings[0 .. $-1] != prev.importStrings[0 .. $-1] || imp.importStrings[0 .. $-1]
!= prev.importStrings[0 .. $-1]
) )
{ {
result[idx++].importString = null; result[idx++].importString = null;
} }
} }
else
{
if (imp.importStrings[0] != prev.importStrings[0])
{
result[idx++].importString = null;
}
}
}
result[idx].importString = imp.importStrings.join("."); result[idx].importString = imp.importStrings.join(".");
result[idx].renamedAs = imp.renamedAs; result[idx].renamedAs = imp.renamedAs;

2
src/dfmt/formatter.d
View File

@ -461,8 +461,6 @@ private:
{ {
break; break;
} }
else if (currentIs(tok!"{") && config.dfmt_brace_style == BraceStyle.allman)
break;
else if (currentIs(tok!"{") && config.dfmt_brace_style == BraceStyle.allman) else if (currentIs(tok!"{") && config.dfmt_brace_style == BraceStyle.allman)
break; break;
else if (isImport && !currentIs(tok!"import") else if (isImport && !currentIs(tok!"import")