Merge pull request #634 from prettier/fixes

Fix link to plugin.js and embed handling tags with no type attribute

Author: kddnewton

README.md

@@ -44,7 +44,7 @@ The `prettier` executable is now installed and ready for use:
 
 ## Configuration
 
-Below are the options (from [`src/plugin.ts`](src/plugin.ts)) that `@prettier/plugin-xml` currently supports:
+Below are the options (from [`src/plugin.js`](src/plugin.js)) that `@prettier/plugin-xml` currently supports:
 
 | API Option                 | CLI Option                     |  Default   | Description                                                                                                   |
 | -------------------------- | ------------------------------ | :--------: | ------------------------------------------------------------------------------------------------------------- |

src/embed.js

@@ -35,6 +35,21 @@ function getElementTags(path, opts, print) {
   };
 }
 
+// Returns the value of the type tag if there is one, otherwise returns null.
+function getTagType(attributes) {
+  for (const attribute of attributes) {
+    if (attribute.children.Name[0].image === "type") {
+      const value = attribute.children.STRING[0].image;
+
+      if (value.startsWith('"text/') && value.endsWith('"')) {
+        return value.slice(6, -1);
+      }
+    }
+  }
+
+  return null;
+}
+
 // Get the name of the parser that is represented by the given element node,
 // return null if a matching parser cannot be found
 function getParser(node, opts) {
@@ -47,30 +62,10 @@ function getParser(node, opts) {
     return null;
   }
 
-  // If this is a style tag with a text/xxx type then we will use xxx as the
-  // name of the parser
-  if (parser === "style" && attribute) {
-    const typeAttr = attribute.find(
-      (attr) => attr.children.Name[0].image === "type"
-    );
-    const typeValue = typeAttr && typeAttr.children.STRING[0].image;
-
-    if (typeValue.startsWith('"text/') && typeValue.endsWith('"')) {
-      parser = typeValue.slice(6, -1);
-    }
-  }
-
-  // If this is a script tag with text/xxx then we will use xxx as the name of
-  // the parser
-  if (parser === "script" && attribute) {
-    const typeAttr = attribute.find(
-      (attr) => attr.children.Name[0].image === "type"
-    );
-    const typeValue = typeAttr && typeAttr.children.STRING[0].image;
-
-    if (typeValue.startsWith('"text/') && typeValue.endsWith('"')) {
-      parser = typeValue.slice(6, -1);
-    }
+  // If this is a style tag or a script tag with a text/xxx type then we will
+  // use xxx as the name of the parser
+  if ((parser === "style" || parser === "script") && attribute) {
+    parser = getTagType(attribute);
   }
 
   // If the name of the parser is "javascript", then we're going to switch over

test/__snapshots__/format.test.js.snap

@@ -36,6 +36,7 @@ use {
   fill: orange;
 }
   </style>
+  <script value="lint" />
 
   <yaml
     myveryveryveryverylongattributename="myveryveryveryverylongattributevalue">
@@ -112,6 +113,7 @@ use {
   fill: orange;
 }
   </style>
+  <script value="lint"/>
 
   <yaml
     myveryveryveryverylongattributename="myveryveryveryverylongattributevalue">
@@ -189,6 +191,7 @@ use {
   fill: orange;
 }
   </style>
+  <script value="lint" />
 
   <yaml
     myveryveryveryverylongattributename="myveryveryveryverylongattributevalue"
@@ -264,6 +267,7 @@ use {
   fill: orange;
 }
   </style>
+  <script value="lint" />
 
   <yaml
     myveryveryveryverylongattributename="myveryveryveryverylongattributevalue"
@@ -354,6 +358,7 @@ use {
   fill: orange;
 }
   </style>
+  <script value="lint"/>
 
   <yaml
     myveryveryveryverylongattributename="myveryveryveryverylongattributevalue"
@@ -432,6 +437,7 @@ use {
   fill: orange;
 }
   </style>
+  <script value="lint" />
 
   <yaml
     myveryveryveryverylongattributename="myveryveryveryverylongattributevalue"

test/fixture.xml

@@ -28,6 +28,7 @@
     use             { stroke: purple;
                       fill: orange; }
   </style>
+  <script value="lint" />
 
   <yaml myveryveryveryverylongattributename="myveryveryveryverylongattributevalue">
     - 1