Fixed "@block" issues

ThisIsManta · Apr 19, 2017 · bf94e53 · bf94e53
1 parent 99516f6
commit bf94e53
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 34 deletions.
diff --git a/edge/format.js b/edge/format.js
@@ -128,7 +128,7 @@ function format(content, options) {
 		} else if (inputNode instanceof stylus.nodes.Root || inputNode instanceof stylus.nodes.Block) {
 			const childIndentLevel = inputNode instanceof stylus.nodes.Root ? 0 : (indentLevel + 1)
 
-			if (inputNode instanceof stylus.nodes.Block && options.insertBraces) {
+			if (inputNode instanceof stylus.nodes.Block && (parentNode instanceof stylus.nodes.Atblock ? options.alwaysUseAtBlock : options.insertBraces)) {
 				outputBuffer.append(' {')
 			}
 
@@ -252,7 +252,7 @@ function format(content, options) {
 				outputBuffer.append(bottomCommentNodes.map(node => travel(inputNode.parent, node, childIndentLevel)).join(''))
 			}
 
-			if (inputNode instanceof stylus.nodes.Block && options.insertBraces) {
+			if (inputNode instanceof stylus.nodes.Block && (parentNode instanceof stylus.nodes.Atblock ? options.alwaysUseAtBlock : options.insertBraces)) {
 				outputBuffer.append(indent + '}')
 				outputBuffer.append(options.newLineChar)
 			}

diff --git a/spec/block/formattingOptions.json b/spec/block/formattingOptions.json
diff --git a/spec/block/input.styl b/spec/block/input.styl
diff --git a/spec/block/output.styl b/spec/block/output.styl
diff --git a/spec/option-always-use-at-block-false/formattingOptions.json b/spec/option-always-use-at-block-false/formattingOptions.json
@@ -1,4 +1,5 @@
 {
 	"alwaysUseAtBlock": false,
+	"insertBraces": true,
 	"newLineChar": "\r\n"
 }
diff --git a/spec/option-always-use-at-block-false/output.styl b/spec/option-always-use-at-block-false/output.styl
@@ -1,9 +1,7 @@
-foo = {
+foo =
 	width: 20px;
-}
-bar = {
+bar =
 	height: 30px;
-}
 
 .class1 {
 	{foo};

diff --git a/spec/option-always-use-at-block-true/formattingOptions.json b/spec/option-always-use-at-block-true/formattingOptions.json
@@ -1,5 +1,5 @@
 {
 	"alwaysUseAtBlock": true,
-	"alwaysUseAtBlock": true,
+	"insertBraces": false,
 	"newLineChar": "\r\n"
 }
diff --git a/spec/option-always-use-at-block-true/output.styl b/spec/option-always-use-at-block-true/output.styl
@@ -5,7 +5,6 @@ bar = @block {
 	height: 30px;
 }
 
-.class1 {
+.class1
 	{foo};
-	{bar};
-}
+	{bar};
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ bar = @block { @@
     	height: 30px;
     }
-    .class1 {
+    .class1
     	{foo};
-    	{bar};
-    }
+    	{bar};