Add indentation autofixing for selectors, at-rules params, and declar…

…ations
stylelint · Jun 9, 2017 · de74769 · de74769
1 parent 79a1ff4
commit de74769
Show file tree

Hide file tree

Showing 5 changed files with 454 additions and 319 deletions.
diff --git a/lib/rules/indentation/__tests__/at-rules.js b/lib/rules/indentation/__tests__/at-rules.js
@@ -13,10 +13,14 @@ testRule(rule, {
 
   accept: [ {
     code: "@media print {\n" + "  a {\n" + "    color: pink;\n" + "  }\n" + "}",
+  }, {
+    code: "@media\n" + "  print {\n" + "  a {\n" + "    color: pink;\n" + "  }\n" + "}",
   }, {
     code: "@media print {\n" + "  a {\n" + "    color: pink;\n" + "  }\n" + "}\n" + "\n" + "@media screen {\n" + "  b { color: orange; }\n" + "}",
   }, {
     code: "@media print {\r\n" + "  a {\r\n" + "    color: pink;\r\n" + "  }\r\n" + "}",
+  }, {
+    code: "@media\r\n" + "  print {\r\n" + "  a {\r\n" + "    color: pink;\r\n" + "  }\r\n" + "}",
   }, {
     code: "@media print {\r\n" + "  a {\r\n" + "    color: pink;\r\n" + "  }\r\n" + "}\r\n" + "\r\n" + "@media screen {\r\n" + "  b { color: orange; }\r\n" + "}",
   } ],
@@ -91,6 +95,22 @@ testRule(rule, {
     message: messages.expected("0 spaces"),
     line: 5,
     column: 2,
+  }, {
+    code: "@media\n" + " print {\n" + "  a {\n" + "    color: pink;\n" + "  }\n" + "}",
+    fixed: "@media\n" + "  print {\n" + "  a {\n" + "    color: pink;\n" + "  }\n" + "}",
+    description: "at-rule parameters on the next line",
+
+    message: messages.expected("2 spaces"),
+    line: 2,
+    column: 2,
+  }, {
+    code: "@media\r\n" + " print {\r\n" + "  a {\r\n" + "    color: pink;\r\n" + "  }\r\n" + "}",
+    fixed: "@media\r\n" + "  print {\r\n" + "  a {\r\n" + "    color: pink;\r\n" + "  }\r\n" + "}",
+    description: "at-rule parameters on the next line (CRLF)",
+
+    message: messages.expected("2 spaces"),
+    line: 2,
+    column: 2,
   } ],
 })
 
@@ -119,14 +139,22 @@ testRule(rule, {
     message: messages.expected("1 tab"),
     line: 4,
     column: 1,
-  // }, {
-  //   code: "@media print,\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\n" + "\t(min-resolution: 120dpi) {}",
-  //   fixed: "@media print,\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\n" + "\t(min-resolution: 120dpi) {}",
-
-  //   description: "multi-line at-rule params",
-  //   message: messages.expected("1 tab"),
-  //   line: 2,
-  //   column: 3,
+  }, {
+    code: "@media print,\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\n" + "\t(min-resolution: 120dpi) {}",
+    fixed: "@media print,\n" + "\t(-webkit-min-device-pixel-ratio: 1.25),\n" + "\t(min-resolution: 120dpi) {}",
+
+    description: "multi-line at-rule params",
+    message: messages.expected("1 tab"),
+    line: 2,
+    column: 3,
+  }, {
+    code: "@media print,\r\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\r\n" + "\t(min-resolution: 120dpi) {}",
+    fixed: "@media print,\r\n" + "\t(-webkit-min-device-pixel-ratio: 1.25),\r\n" + "\t(min-resolution: 120dpi) {}",
+
+    description: "multi-line at-rule params (CRLF)",
+    message: messages.expected("1 tab"),
+    line: 2,
+    column: 3,
   } ],
 })
 
@@ -139,14 +167,23 @@ testRule(rule, {
     code: "@media print,\n" + "(-webkit-min-device-pixel-ratio: 1.25),\n" + "(min-resolution: 120dpi) {}",
   }],
 
-  // reject: [{
-  //   code: "@media print,\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\n" + "(min-resolution: 120dpi) {}",
-  //   fixed: "@media print,\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\n" + "(min-resolution: 120dpi) {}",
+  reject: [ {
+    code: "@media print,\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\n" + "(min-resolution: 120dpi) {}",
+    fixed: "@media print,\n" + "(-webkit-min-device-pixel-ratio: 1.25),\n" + "(min-resolution: 120dpi) {}",
+
+    description: "multi-line at-rule params, no params indent",
+    message: messages.expected("0 spaces"),
+    line: 2,
+    column: 3,
+  }, {
+    code: "@media print,\r\n" + "  (-webkit-min-device-pixel-ratio: 1.25),\r\n" + "(min-resolution: 120dpi) {}",
+    fixed: "@media print,\r\n" + "(-webkit-min-device-pixel-ratio: 1.25),\r\n" + "(min-resolution: 120dpi) {}",
 
-  //   message: messages.expected("0 spaces"),
-  //   line: 2,
-  //   column: 3,
-  // }],
+    description: "multi-line at-rule params, no params indent (CRLF)",
+    message: messages.expected("0 spaces"),
+    line: 2,
+    column: 3,
+  } ],
 })
 
 testRule(rule, {