Fixed conditional import

See #20
ThisIsManta · Jan 20, 2018 · 4972389 · 4972389
1 parent d24b47c
commit 4972389
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/edge/format.js b/edge/format.js
@@ -102,10 +102,12 @@ function format(content, options = {}) {
 			outputBuffer.append(' ')
 			outputBuffer.append(travel(inputNode, inputNode.path, indentLevel, true))
 
-			if (options.insertSemicolons) {
-				outputBuffer.append(';')
+			if (insideExpression === false) {
+				if (options.insertSemicolons) {
+					outputBuffer.append(';')
+				}
+				outputBuffer.append(options.newLineChar)
 			}
-			outputBuffer.append(options.newLineChar)
 
 		} else if (inputNode instanceof Stylus.nodes.Group) {
 			// Insert single-line comment(s)

diff --git a/spec/condition/input.styl b/spec/condition/input.styl
@@ -15,4 +15,6 @@ body
 negative(n)
   error('invalid number') unless n is a 'unit'
   return yes if n < 0
-  no
+  no
+
+@import -fn if (exists(-fn));
diff --git a/spec/condition/output.styl b/spec/condition/output.styl
@@ -22,4 +22,6 @@ negative(n) {
 	return yes if (n < 0);
 
 	no;
-}
+}
+
+@import -fn if (exists(-fn));
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,6 @@ negative(n) { @@
     	return yes if (n < 0);
     	no;
-    }
+    }
+    @import -fn if (exists(-fn));