Merge 8be1589 into e005ff5

stylelint-scss · Jan 28, 2020 · 858beaf · 858beaf
2 parents e005ff5 + 8be1589
commit 858beaf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/rules/at-import-partial-extension/__tests__/index.js b/src/rules/at-import-partial-extension/__tests__/index.js
@@ -74,6 +74,12 @@ testRule(rule, {
       description:
         "Import CSS from the web, https://, trailing spaces inside quotes"
     },
+    {
+      code: `
+      @import 'https://fonts.googleapis.com/css?family=Montserrat:400,600&display=swap';
+    `,
+      description: "Import CSS from the web, https:// with comma"
+    },
     {
       code: `
       @import "//_file.scss";
@@ -105,6 +111,12 @@ testRule(rule, {
     `,
       description: "Import CSS (with media queries - url + media)."
     },
+    {
+      code: `
+      @import url('https://fonts.googleapis.com/css?family=Montserrat:400,600&display=swap');
+    `,
+      description: "Import CSS from the web, https:// with comma"
+    },
     {
       code: `
       @import _file.scss tv, screen;
@@ -218,6 +230,12 @@ testRule(rule, {
       description:
         "Import CSS from the web, https://, trailing spaces inside quotes"
     },
+    {
+      code: `
+      @import 'https://fonts.googleapis.com/css?family=Montserrat:400,600&display=swap';
+    `,
+      description: "Import CSS from the web, https:// with comma"
+    },
     {
       code: `
       @import "//_file.scss";
@@ -249,6 +267,12 @@ testRule(rule, {
     `,
       description: "Import CSS (with media queries - url + media)."
     },
+    {
+      code: `
+      @import url('https://fonts.googleapis.com/css?family=Montserrat:400,600&display=swap');
+    `,
+      description: "Import CSS from the web, https:// with comma"
+    },
     {
       code: `
       @import _file.scss tv, screen;

diff --git a/src/rules/at-import-partial-extension/index.js b/src/rules/at-import-partial-extension/index.js
@@ -41,7 +41,7 @@ export default function(expectation) {
 
     root.walkAtRules("import", decl => {
       const paths = decl.params
-        .split(",")
+        .split(/["']\s*,/)
         .filter(path => !mediaQueryTypesRE.test(path.trim()));
 
       // Processing comma-separated lists of import paths