Fixed missing parenthesis in string interpolation

ThisIsManta · Dec 30, 2017 · 80bd914 · 80bd914
1 parent 054344e
commit 80bd914
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/edge/format.js b/edge/format.js
@@ -584,6 +584,12 @@ function format(content, options = {}) {
 					inputNode.parent.op !== '[]' &&
 					inputNode.parent.op !== '[]='
 				)
+			const parentIsStringInterpolation = (
+				inputNode.parent instanceof Stylus.nodes.BinOp &&
+				inputNode.parent.op === '%' &&
+				inputNode.parent.right === inputNode &&
+				inputNode.nodes.length > 1
+			)
 			const parentIsNestedExpression =
 				inputNode.nodes.length === 1 &&
 				inputNode.parent instanceof Stylus.nodes.Expression &&
@@ -606,6 +612,7 @@ function format(content, options = {}) {
 				inputNode.nodes[1] instanceof Stylus.nodes.Ident
 			const currentHasParenthesis =
 				parentIsArithmeticOperator ||
+				parentIsStringInterpolation ||
 				parentIsNestedExpression ||
 				currentIsDivision
 			if (currentHasParenthesis || currentHasUnitSuffix) {

diff --git a/spec/interpolation/input.styl b/spec/interpolation/input.styl
@@ -8,4 +8,7 @@ div:nth-child({row})
 
 mySelectors='#foo,#bar,.class1'
 {mySelectors+'.class2'}
-  display none
+  display none
+
+.class3
+  height 'calc(%s - %s)' % (a b)
diff --git a/spec/interpolation/output.styl b/spec/interpolation/output.styl
@@ -13,4 +13,8 @@ mySelectors = '#foo,#bar,.class1';
 
 {mySelectors + '.class2'} {
 	display: none;
+}
+
+.class3 {
+	height: 'calc(%s - %s)' % (a b);
 }