Rework indentation system. Fix #91. Fix #86. Fix #54.

dlang-community · Mar 11, 2015 · 1ef17c5 · 1ef17c5
1 parent 52eabd4
commit 1ef17c5
Show file tree

Hide file tree

Showing 13 changed files with 401 additions and 206 deletions.
diff --git a/src/dfmt.d b/src/dfmt.d
diff --git a/tests/issue0054.d b/tests/issue0054.d
@@ -0,0 +1,29 @@
+struct ClassFlags
+ {
+     alias Type = uint;
+     enum Enum : int
+     {
+        isCOMclass = 0x1,
+        noPointers = 0x2,
+        hasOffTi = 0x4,
+        hasCtor = 0x8,
+        hasGetMembers = 0x10,
+        hasTypeInfo = 0x20,
+        isAbstract = 0x40,
+        isCPPclass = 0x80,
+        hasDtor = 0x100,
+
+     }
+
+     alias isCOMclass = Enum.isCOMclass;
+    alias noPointers = Enum.noPointers;
+    alias hasOffTi = Enum.hasOffTi;
+    alias hasCtor = Enum.hasCtor;
+    alias hasGetMembers = Enum.hasGetMembers;
+    alias hasTypeInfo = Enum.hasTypeInfo;
+    alias isAbstract = Enum.isAbstract;
+    alias isCPPclass = Enum.isCPPclass;
+    alias hasDtor = Enum.hasDtor;
+
+
+ }
diff --git a/tests/issue0054.d.ref b/tests/issue0054.d.ref
@@ -0,0 +1,21 @@
+struct ClassFlags
+{
+    alias Type = uint;
+    enum Enum : int
+    {
+        isCOMclass = 0x1, noPointers = 0x2, hasOffTi = 0x4, hasCtor = 0x8,
+            hasGetMembers = 0x10, hasTypeInfo = 0x20, isAbstract = 0x40,
+                isCPPclass = 0x80, hasDtor = 0x100,
+
+    }
+
+    alias isCOMclass = Enum.isCOMclass;
+    alias noPointers = Enum.noPointers;
+    alias hasOffTi = Enum.hasOffTi;
+    alias hasCtor = Enum.hasCtor;
+    alias hasGetMembers = Enum.hasGetMembers;
+    alias hasTypeInfo = Enum.hasTypeInfo;
+    alias isAbstract = Enum.isAbstract;
+    alias isCPPclass = Enum.isCPPclass;
+    alias hasDtor = Enum.hasDtor;
+}
diff --git a/tests/issue0056.d b/tests/issue0056.d
@@ -1 +1 @@
-{{{}}{}}
+unittest{{{}}{}{{{{}}}}}
diff --git a/tests/issue0056.d.ref b/tests/issue0056.d.ref
@@ -1,8 +1,17 @@
+unittest
 {
     {
         {
         }
     }
     {
     }
+    {
+        {
+            {
+                {
+                }
+            }
+        }
+    }
 }
diff --git a/tests/issue0080.d.ref b/tests/issue0080.d.ref
@@ -7,7 +7,7 @@ unittest
         version (A)
         {
     case b:
-        return;
+            return;
         }
     }
 }
diff --git a/tests/issue0082.d.ref b/tests/issue0082.d.ref
@@ -11,4 +11,4 @@ Label:
     // comment
     statement();
 }
-}
+}
diff --git a/tests/issue0086.d b/tests/issue0086.d
@@ -0,0 +1,26 @@
+unittest
+{
+	if (a)
+		if (b)
+			doSomething();
+	doSomethingElse();
+}
+
+void indent()
+{
+	import std.range : repeat, take;
+
+	if (config.useTabs)
+		foreach (i; 0 .. indentLevel + tempIndent)
+		{
+			currentLineLength += config.tabSize;
+			output.put("\t");
+		}
+		else
+			foreach (i; 0 .. indentLevel + tempIndent)
+				foreach (j; 0 .. config.indentSize)
+				{
+					output.put(" ");
+		currentLineLength++;
+				}
+}
diff --git a/tests/issue0086.d.ref b/tests/issue0086.d.ref
@@ -0,0 +1,26 @@
+unittest
+{
+    if (a)
+        if (b)
+            doSomething();
+    doSomethingElse();
+}
+
+void indent()
+{
+    import std.range : repeat, take;
+
+    if (config.useTabs)
+        foreach (i; 0 .. indentLevel + tempIndent)
+        {
+            currentLineLength += config.tabSize;
+            output.put("\t");
+        }
+    else
+        foreach (i; 0 .. indentLevel + tempIndent)
+            foreach (j; 0 .. config.indentSize)
+            {
+                output.put(" ");
+                currentLineLength++;
+            }
+}
diff --git a/tests/issue0091.d b/tests/issue0091.d
@@ -0,0 +1,13 @@
+unittest
+{
+    switch (x)
+    {
+        version (none)
+        {
+            x();
+    case Case:
+            doSomething();
+            doSomethingElse();
+        }
+    }
+}
diff --git a/tests/issue0091.d.ref b/tests/issue0091.d.ref
@@ -0,0 +1,13 @@
+unittest
+{
+    switch (x)
+    {
+        version (none)
+        {
+            x();
+    case Case:
+            doSomething();
+            doSomethingElse();
+        }
+    }
+}
diff --git a/tests/longParamList.d b/tests/longParamList.d
@@ -0,0 +1,14 @@
+version (AArch64)
+{
+class SomeLongClassName
+{
+public:
+
+double javaStyleFunctionName(double alpha, double bravo, double charlie, double delta, double echo, double foxtrot, double golf, double hotel)
+{
+if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie && echo < delta)
+{
+if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie && echo < delta)
+{
+if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie && echo < delta)
+{}}}}}}
diff --git a/tests/longParamList.d.ref b/tests/longParamList.d.ref
@@ -0,0 +1,24 @@
+version (AArch64)
+{
+    class SomeLongClassName
+    {
+    public:
+
+        double javaStyleFunctionName(double alpha, double bravo, double charlie,
+            double delta, double echo, double foxtrot, double golf, double hotel)
+        {
+            if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie
+                    && echo < delta)
+            {
+                if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie
+                        && echo < delta)
+                {
+                    if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie
+                            && echo < delta)
+                    {
+                    }
+                }
+            }
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ unittest @@
             version (A)
             {
         case b:
-            return;
+                return;
             }
         }
     }