Fixed adding @css block on property key

See #63
ThisIsManta · May 5, 2020 · e0dc5bf · e0dc5bf
1 parent e370d85
commit e0dc5bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/edge/format.js b/edge/format.js
@@ -420,7 +420,7 @@ function format(content, options = {}) {
 			outputBuffer.append(options.newLineChar)
 
 		} else if (inputNode instanceof Stylus.nodes.Literal) {
-			if (inputNode.parent instanceof Stylus.nodes.Property && inputNode.parent.expr.nodes.length === 1) { // In case of @css property
+			if (inputNode.parent instanceof Stylus.nodes.Property && inputNode.parent.expr.nodes.length === 1 && inputNode.parent.expr.nodes[0] === inputNode) { // In case of @css property
 				// Note that it must be wrapped inside a pair of braces
 				outputBuffer.append('@css {')
 				if (inputNode.val.trim().length > 0) {

diff --git a/spec/rule/input.styl b/spec/rule/input.styl
@@ -23,5 +23,6 @@
 body
   .class1
     border-color @css { ${$design.primaryLight} }
+    {type}-{direction} none
 
 @reset-global pc
diff --git a/spec/rule/output.styl b/spec/rule/output.styl
@@ -30,6 +30,7 @@
 body {
 	.class1 {
 		border-color: @css { ${$design.primaryLight} };
+		{type}-{direction}: none;
 	}
 }
 

diff --git a/test/runner.js b/test/runner.js
@@ -34,17 +34,25 @@ filesAndDirectories.filter(directoriesOnly).forEach(directory => {
 	const outputDebuggingFilePath = pt.join(directory, 'output-debugging.json')
 
 	const inputContent = fs.readFileSync(inputFilePath, 'utf8')
-	const outputContent = fs.readFileSync(outputFilePath, 'utf8')
 
 	let formattingOptions = undefined
 	if (fs.existsSync(optionFilePath)) {
 		formattingOptions = require('../' + optionFilePath)
 	}
 
+	if (fs.existsSync(outputFilePath) === false) {
+		const actualContent = format(inputContent, formattingOptions)
+		fs.writeFileSync(outputFilePath, actualContent)
+	}
+
+	const outputContent = fs.readFileSync(outputFilePath, 'utf8')
+
 	const testSpecName = pt.basename(directory)
 	describe(testSpecName, () => {
 		it('can be formatted', () => {
-			if (fs.existsSync(inputFormattedFilePath)) fs.unlinkSync(inputFormattedFilePath)
+			if (fs.existsSync(inputFormattedFilePath)) {
+				fs.unlinkSync(inputFormattedFilePath)
+			}
 
 			try {
 				const tree = new Stylus.Parser(inputContent).parse()
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
     body {
     	.class1 {
     		border-color: @css { ${$design.primaryLight} };
+    		{type}-{direction}: none;
     	}
     }
@@ Expand Down @@