Merge pull request #1129 from sasstools/feature/Fix-atrules-space-colon

fix at-root space after colon
sasstools · Sep 2, 2017 · ca0690b · ca0690b
2 parents a214c4f + 94ad31e
commit ca0690b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 24 deletions.
diff --git a/lib/rules/space-after-colon.js b/lib/rules/space-after-colon.js
@@ -11,29 +11,30 @@ module.exports = {
     var result = [];
 
     ast.traverseByTypes(['propertyDelimiter', 'operator'], function (delimiter, i, parent) {
-      if (delimiter.content === ':') {
-        var next = parent.content[i + 1];
-
-        if (next && next.is('space')) {
-          if (!parser.options.include) {
-            result = helpers.addUnique(result, {
-              'ruleId': parser.rule.name,
-              'line': next.start.line,
-              'column': next.start.column,
-              'message': 'No space allowed after `:`',
-              'severity': parser.severity
-            });
+      if (!parent.is('atrule')) {
+        if (delimiter.content === ':') {
+          var next = parent.content[i + 1];
+          if (next && next.is('space')) {
+            if (!parser.options.include) {
+              result = helpers.addUnique(result, {
+                'ruleId': parser.rule.name,
+                'line': next.start.line,
+                'column': next.start.column,
+                'message': 'No space allowed after `:`',
+                'severity': parser.severity
+              });
+            }
           }
-        }
-        else {
-          if (parser.options.include) {
-            result = helpers.addUnique(result, {
-              'ruleId': parser.rule.name,
-              'line': delimiter.start.line,
-              'column': delimiter.start.column,
-              'message': 'Space expected after `:`',
-              'severity': parser.severity
-            });
+          else {
+            if (parser.options.include) {
+              result = helpers.addUnique(result, {
+                'ruleId': parser.rule.name,
+                'line': delimiter.start.line,
+                'column': delimiter.start.column,
+                'message': 'Space expected after `:`',
+                'severity': parser.severity
+              });
+            }
           }
         }
       }

diff --git a/tests/rules/space-after-colon.js b/tests/rules/space-after-colon.js
@@ -12,7 +12,7 @@ describe('space after colon - scss', function () {
     lint.test(file, {
       'space-after-colon': 1
     }, function (data) {
-      lint.assert.equal(3, data.warningCount);
+      lint.assert.equal(4, data.warningCount);
       done();
     });
   });
@@ -26,7 +26,7 @@ describe('space after colon - scss', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(4, data.warningCount);
+      lint.assert.equal(6, data.warningCount);
       done();
     });
   });

diff --git a/tests/sass/space-after-colon.sass b/tests/sass/space-after-colon.sass
@@ -14,3 +14,9 @@
 
 $qux: 'qux'
 $norf:'norf'
+
+.foo
+  @at-root button#{&}:hover
+
+.foo:hover
+  +test
diff --git a/tests/sass/space-after-colon.scss b/tests/sass/space-after-colon.scss
@@ -14,3 +14,17 @@
 
 $qux: 'qux';
 $norf:'norf';
+
+.foo {
+    @at-root button#{&}:hover {
+    }
+}
+
+.foo:hover {
+  @include test;
+}
+
+$map: {
+  test:'red',
+  other: blue,
+}