prettier
diff --git a/‎changelog_unreleased/css/pr-7933.md‎
Lines changed: 1 addition & 1 deletion b/‎changelog_unreleased/css/pr-7933.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/language-css/parser-postcss.js‎
Lines changed: 4 additions & 4 deletions b/‎src/language-css/parser-postcss.js‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/language-css/printer-postcss.js‎
Lines changed: 6 additions & 6 deletions b/‎src/language-css/printer-postcss.js‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/language-css/utils.js‎
Lines changed: 19 additions & 14 deletions b/‎src/language-css/utils.js‎
Lines changed: 19 additions & 14 deletions
@@ -1,4 +1,4 @@
-#### [BREAKING] Add the pure `css` parser (#7933 by @fisker)
+#### [BREAKING] Add the pure `css` parser (#7933, #9092, #9093 by @fisker)
 
 Previously, when `--parser=css` was passed, Prettier tried to parse the content using `postcss-scss` and `postcss-less`. This caused confusion, and made syntax errors difficult to spot. Now `--parser=css` works only with the vanilla CSS syntax.
 
 
@@ -6,7 +6,6 @@ const { hasPragma } = require("./pragma");
 const {
   hasSCSSInterpolation,
   hasStringOrFunction,
-  isSCSS,
   isSCSSNestedPropertyNode,
   isSCSSVariable,
   stringifyNode,
@@ -40,7 +39,7 @@ function parseValueNode(valueNode, options) {
     const node = nodes[i];
 
     if (
-      isSCSS(options.parser, node.value) &&
+      options.parser === "scss" &&
       node.type === "number" &&
       node.unit === ".." &&
       node.value[node.value.length - 1] === "."
@@ -80,7 +79,8 @@ function parseValueNode(valueNode, options) {
       // Stringify if the value parser can't handle the content.
       if (
         hasSCSSInterpolation(groupList) ||
-        (!hasStringOrFunction(groupList) && !isSCSSVariable(groupList[0]))
+        (!hasStringOrFunction(groupList) &&
+          !isSCSSVariable(groupList[0], options))
       ) {
         const stringifiedContent = stringifyNode({
           groups: node.group.groups,
@@ -370,7 +370,7 @@ function parseNestedCSS(node, options) {
       }
 
       // Check on SCSS nested property
-      if (isSCSSNestedPropertyNode(node)) {
+      if (isSCSSNestedPropertyNode(node, options)) {
         node.isSCSSNesterProperty = true;
       }
 
 
@@ -38,7 +38,6 @@ const {
   insideURLFunctionInImportAtRuleNode,
   isKeyframeAtRuleKeywords,
   isWideKeywords,
-  isSCSS,
   isLastNode,
   isSCSSControlDirectiveNode,
   isDetachedRulesetDeclarationNode,
@@ -277,7 +276,7 @@ function genericPrint(path, options, print) {
               concat([
                 " ",
                 path.call(print, "value"),
-                isSCSSControlDirectiveNode(node)
+                isSCSSControlDirectiveNode(node, options)
                   ? hasParensAroundNode(node)
                     ? " "
                     : line
@@ -289,7 +288,7 @@ function genericPrint(path, options, print) {
           : "",
         node.nodes
           ? concat([
-              isSCSSControlDirectiveNode(node)
+              isSCSSControlDirectiveNode(node, options)
                 ? ""
                 : (node.selector &&
                     !node.selector.nodes &&
@@ -537,7 +536,8 @@ function genericPrint(path, options, print) {
           declAncestorProp.startsWith("grid-template"));
       const atRuleAncestorNode = getAncestorNode(path, "css-atrule");
       const isControlDirective =
-        atRuleAncestorNode && isSCSSControlDirectiveNode(atRuleAncestorNode);
+        atRuleAncestorNode &&
+        isSCSSControlDirectiveNode(atRuleAncestorNode, options);
 
       const printed = path.map(print, "groups");
       const parts = [];
@@ -856,7 +856,7 @@ function genericPrint(path, options, print) {
         return group(indent(fill(res)));
       }
 
-      const isSCSSMapItem = isSCSSMapItemNode(path);
+      const isSCSSMapItem = isSCSSMapItemNode(path, options);
 
       const lastItem = node.groups[node.groups.length - 1];
       const isLastItemComment = lastItem && lastItem.type === "value-comment";
@@ -895,7 +895,7 @@ function genericPrint(path, options, print) {
           ),
           ifBreak(
             !isLastItemComment &&
-              isSCSS(options.parser, options.originalText) &&
+              options.parser === "scss" &&
               isSCSSMapItem &&
               shouldPrintComma(options)
               ? ","
 
@@ -86,16 +86,13 @@ function hasStringOrFunction(groupList) {
   return false;
 }
 
-function isSCSS(parser, text) {
-  const hasExplicitParserChoice = parser === "less" || parser === "scss";
-  const IS_POSSIBLY_SCSS = /(\w\s*:\s*[^:}]+|#){|@import[^\n]+(?:url|,)/;
-  return hasExplicitParserChoice
-    ? parser === "scss"
-    : IS_POSSIBLY_SCSS.test(text);
-}
-
-function isSCSSVariable(node) {
-  return !!(node && node.type === "word" && node.value.startsWith("$"));
+function isSCSSVariable(node, options) {
+  return (
+    options.parser === "scss" &&
+    node &&
+    node.type === "word" &&
+    node.value.startsWith("$")
+  );
 }
 
 function isWideKeywords(value) {
@@ -256,14 +253,19 @@ function isRelationalOperatorNode(node) {
   );
 }
 
-function isSCSSControlDirectiveNode(node) {
+function isSCSSControlDirectiveNode(node, options) {
   return (
+    options.parser === "scss" &&
     node.type === "css-atrule" &&
     ["if", "else", "for", "each", "while"].includes(node.name)
   );
 }
 
-function isSCSSNestedPropertyNode(node) {
+function isSCSSNestedPropertyNode(node, options) {
+  if (options.parser !== "scss") {
+    return false;
+  }
+
   /* istanbul ignore next */
   if (!node.selector) {
     return false;
@@ -341,7 +343,11 @@ function isKeyValuePairInParenGroupNode(node) {
   );
 }
 
-function isSCSSMapItemNode(path) {
+function isSCSSMapItemNode(path, options) {
+  if (options.parser !== "scss") {
+    return false;
+  }
+
   const node = path.getValue();
 
   // Ignore empty item (i.e. `$key: ()`)
@@ -469,7 +475,6 @@ module.exports = {
   insideURLFunctionInImportAtRuleNode,
   isKeyframeAtRuleKeywords,
   isWideKeywords,
-  isSCSS,
   isSCSSVariable,
   isLastNode,
   isSCSSControlDirectiveNode,
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-#### [BREAKING] Add the pure `css` parser (#7933 by @fisker)
	`1`	+#### [BREAKING] Add the pure `css` parser (#7933, #9092, #9093 by @fisker)
`2`	`2`
`3`	`3`	Previously, when `--parser=css` was passed, Prettier tried to parse the content using `postcss-scss` and `postcss-less`. This caused confusion, and made syntax errors difficult to spot. Now `--parser=css` works only with the vanilla CSS syntax.
`4`	`4`