Added support for @charset and @namespace

ThisIsManta · Apr 5, 2017 · 72e862b · 72e862b
1 parent 8e1f116
commit 72e862b
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 4 deletions.
diff --git a/edge/format.js b/edge/format.js
@@ -673,6 +673,15 @@ function format(content, options) {
 			// Remove the extra new-line because of `Ident` and `Block`
 			outputBuffer.remove(options.newLineChar)
 
+		} else if (inputNode instanceof stylus.nodes.Charset) {
+			outputBuffer.append('@charset ')
+			outputBuffer.append(travel(inputNode, inputNode.val, indentLevel, true))
+
+		} else if (inputNode instanceof stylus.nodes.Namespace) {
+			outputBuffer.append('@namespace ')
+			outputBuffer.append(inputNode.prefix ? (inputNode.prefix + ' ') : '')
+			outputBuffer.append(travel(inputNode, inputNode.val, indentLevel, true))
+
 		} else if (inputNode instanceof stylus.nodes.Comment && inputNode.str.startsWith('//')) { // In case of single-line comments
 			if (insideExpression === false) {
 				outputBuffer.append(indent)

diff --git a/spec/charset/formattingOptions.json b/spec/charset/formattingOptions.json
@@ -0,0 +1,13 @@
+{
+	"insertColons": true,
+	"insertSemicolons": true,
+	"insertBraces": true,
+	"insertNewLineBetweenGroups": 1,
+	"insertNewLineBetweenSelectors": false,
+	"insertSpaceBeforeComments": true,
+	"insertSpaceAfterComments": true,
+	"indentChar": "\t",
+	"newLineChar": "\r\n",
+	"sortProperties": false,
+	"alwaysUseImport": false
+}
diff --git a/spec/charset/input.styl b/spec/charset/input.styl
@@ -0,0 +1 @@
+@charset 'utf-8'
diff --git a/spec/charset/output.styl b/spec/charset/output.styl
@@ -0,0 +1 @@
+@charset 'utf-8'
diff --git a/spec/function/input.styl b/spec/function/input.styl
@@ -19,6 +19,8 @@ anonymous-func=@(a,b) {
 
 body
   color mix(#000,#fff,30%)
+  color rgba(115,51,38,0.5)
+  color hsla(10deg, 50%, 30%, 0.5)
 
 +prefix-classes('foo-')
   .bar

diff --git a/spec/function/output.styl b/spec/function/output.styl
@@ -25,6 +25,8 @@ anonymous-func = @(a, b) {
 
 body {
 	color: mix(#000, #fff, 30%);
+	color: rgba(115, 51, 38, 0.5);
+	color: hsla(10deg, 50%, 30%, 0.5);
 }
 
 +prefix-classes('foo-') {

diff --git a/spec/mixin/input.styl b/spec/mixin/input.styl
@@ -14,4 +14,7 @@ foo()
 
 nested-mixin(n)
   inner-mixin(m)
-    margin n m
+    margin n m
+
+body
+  nested-mixin(1)
diff --git a/spec/mixin/output.styl b/spec/mixin/output.styl
@@ -22,4 +22,8 @@ nested-mixin(n) {
 	inner-mixin(m) {
 		margin: n m;
 	}
+}
+
+body {
+	nested-mixin(1);
 }
diff --git a/spec/namespace/formattingOptions.json b/spec/namespace/formattingOptions.json
@@ -0,0 +1,13 @@
+{
+	"insertColons": true,
+	"insertSemicolons": true,
+	"insertBraces": true,
+	"insertNewLineBetweenGroups": 1,
+	"insertNewLineBetweenSelectors": false,
+	"insertSpaceBeforeComments": true,
+	"insertSpaceAfterComments": true,
+	"indentChar": "\t",
+	"newLineChar": "\r\n",
+	"sortProperties": false,
+	"alwaysUseImport": false
+}
diff --git a/spec/namespace/input.styl b/spec/namespace/input.styl
@@ -0,0 +1 @@
+@namespace 'http://www.w3.org/1999/xhtml'
diff --git a/spec/namespace/output.styl b/spec/namespace/output.styl
@@ -0,0 +1,4 @@
+img {
+	src: url('fonts/geo_sans_light/GensansLight.ttf');
+	src: url('fonts/geo_sans_light/GensansLight.ttf');
+}
diff --git a/spec/property/input.styl b/spec/property/input.styl
@@ -2,4 +2,8 @@ body
   filter unquote('progid:DXImageTransform.Microsoft.Alpha(Opacity='+round(n*100)+')')
   padding 1 \+ 2
   font 14px/1.4
-  font (14px/1.4)
+  font (14px/1.4)
+  transition .3s opacity
+  -webkit-user-select none
+  -moz-user-select none
+  -ms-user-select none
diff --git a/spec/property/output.styl b/spec/property/output.styl
@@ -3,4 +3,8 @@ body {
 	padding: 1 \+ 2;
 	font: 14px / 1.4;
 	font: (14px / 1.4);
+	transition: 0.3s opacity;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
 }
diff --git a/spec/selector/input.styl b/spec/selector/input.styl
@@ -25,9 +25,21 @@ body
     /body
       display none
 
-  .class2
+  .class2.class3
     ../input
       display none
+
+  .\\--class4
+    display none
+
+  &:hover:not(.--limited)
+    display none
 
+  &[disabled]
+    display none
+
+  input[type=number]::-webkit-outer-spin-button
+    display none
+
 body > a
   display none
diff --git a/spec/selector/output.styl b/spec/selector/output.styl
@@ -33,11 +33,27 @@ body {
 		}
 	}
 
-	.class2 {
+	.class2.class3 {
 		../input {
 			display: none;
 		}
 	}
+
+	.\\--class4 {
+		display: none;
+	}
+
+	&:hover:not(.--limited) {
+		display: none;
+	}
+
+	&[disabled] {
+		display: none;
+	}
+
+	input[type=number]::-webkit-outer-spin-button {
+		display: none;
+	}
 }
 
 body > a {