Merge pull request #333 from Tofandel/patch-2

fix(border-zero): Resolver strips important when modifying node content
srowhani · Aug 27, 2020 · da131c4 · da131c4
2 parents d37cc47 + 52453e2
commit da131c4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/src/helpers/get-config.ts b/src/helpers/get-config.ts
@@ -16,6 +16,7 @@ const defaultSearchPlaces = (moduleName: string) => [
 ];
 
 export function loadDefaults(): ConfigOpts {
+  // @ts-ignore
   return safeLoad(
     readFileSync(require.resolve('../config/default.yml'), {
       encoding: 'utf8',

diff --git a/src/resolvers/border-zero.ts b/src/resolvers/border-zero.ts
@@ -24,9 +24,14 @@ export default class BorderZero extends BaseResolver {
   }
 
   public fix(): Node {
-    return this.traverse(
-      (node: Node) => (node.content = String(this.convention)),
-    );
+    return this.traverse((node: Node) => {
+      const ident = node.first('ident');
+      if (ident) {
+        ident.content = String(this.convention);
+      } else {
+        node.content = String(this.convention);
+      }
+    });
   }
 
   private traverse(callback: (node: Node) => void): Node {

diff --git a/test/sass/border-zero.sass b/test/sass/border-zero.sass
@@ -20,3 +20,11 @@
 
 .norf
   border: 1px
+
+
+.faz
+  border: 0 !important
+
+
+.fax
+  border: none !important
diff --git a/test/sass/border-zero.scss b/test/sass/border-zero.scss
@@ -22,6 +22,14 @@
   border: 1px;
 }
 
+.faz {
+  border: 0 !important;
+}
+
+.fax {
+  border: none !important;
+}
+
 .norf {
   // sass-lint:disable border-zero
   border: none;

diff --git a/test/src/resolvers/border-zero.ts b/test/src/resolvers/border-zero.ts
@@ -18,10 +18,16 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
         const postResolve = detect(ast.toString(), ValidFileType.scss, options);
 
-        expect(preResolve.warningCount).toBe(3);
+        expect(preResolve.warningCount).toBe(4);
         expect(postResolve.warningCount).toBe(0);
       });
 
+      it('preserves important', () => {
+        const filename = 'test/sass/border-zero.scss';
+        const { ast } = resolveFirst(filename, options);
+        expect(ast.toString()).toContain('border: 0 !important;');
+      });
+
       it('content not treated as falsey when set zero', () => {
         const filename = 'test/sass/border-zero.scss';
         const { ast } = resolveFirst(filename, options);
@@ -36,7 +42,7 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
         const postResolve = detect(ast.toString(), ValidFileType.scss, options);
 
-        expect(preResolve.warningCount).toBe(3);
+        expect(preResolve.warningCount).toBe(4);
         expect(postResolve.warningCount).toBe(0);
       });
     });
@@ -55,7 +61,7 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
 
         const postResolve = detect(ast.toString(), ValidFileType.scss, options);
-        expect(preResolve.warningCount).toBe(2);
+        expect(preResolve.warningCount).toBe(3);
         expect(postResolve.warningCount).toBe(0);
       });
     });
@@ -74,7 +80,7 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
         const postResolve = detect(ast.toString(), ValidFileType.scss, options);
 
-        expect(preResolve.warningCount).toBe(4);
+        expect(preResolve.warningCount).toBe(5);
         expect(postResolve.warningCount).toBe(0);
       });
     });
@@ -97,7 +103,7 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
         const postResolve = detect(ast.toString(), ValidFileType.sass, options);
 
-        expect(preResolve.warningCount).toBe(3);
+        expect(preResolve.warningCount).toBe(4);
         expect(postResolve.warningCount).toBe(0);
       });
     });
@@ -109,7 +115,7 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
         const postResolve = detect(ast.toString(), ValidFileType.sass, options);
 
-        expect(preResolve.warningCount).toBe(3);
+        expect(preResolve.warningCount).toBe(4);
         expect(postResolve.warningCount).toBe(0);
       });
     });
@@ -128,7 +134,7 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
         const postResolve = detect(ast.toString(), ValidFileType.sass, options);
 
-        expect(preResolve.warningCount).toBe(2);
+        expect(preResolve.warningCount).toBe(3);
         expect(postResolve.warningCount).toBe(0);
       });
     });
@@ -147,7 +153,7 @@ describe('border-zero', () => {
         const preResolve = lint(filename, options);
         const postResolve = detect(ast.toString(), ValidFileType.sass, options);
 
-        expect(preResolve.warningCount).toBe(4);
+        expect(preResolve.warningCount).toBe(5);
         expect(postResolve.warningCount).toBe(0);
       });
     });