(fix) adjust wrong "is inside other tag" check (#247)

Fixes #244

CHANGELOG.md

@@ -1,5 +1,9 @@
 # prettier-plugin-svelte changelog
 
+## Unreleased
+
+* (fix) Adjust "is inside other tag"-checks when snipping tags ([#244](https://github.com/sveltejs/prettier-plugin-svelte/issues/244))
+
 ## 2.3.1
 
 * (fix) More robust check for `hardline` to prevent trailing empty lines in `<style>`/`<script>` tags ([#222](https://github.com/sveltejs/prettier-plugin-svelte/issues/222))

src/lib/snipTagContent.ts

@@ -5,10 +5,9 @@ export function snipScriptAndStyleTagContent(source: string): string {
     const styleMatchSpans = getMatchIndexes('style');
 
     return snipTagContent(
-        snipTagContent(source, 'script', '{}', scriptMatchSpans, styleMatchSpans),
+        snipTagContent(source, 'script', '{}', styleMatchSpans),
         'style',
         '',
-        styleMatchSpans,
         scriptMatchSpans,
     );
 
@@ -26,23 +25,19 @@ export function snipScriptAndStyleTagContent(source: string): string {
         _source: string,
         tagName: string,
         placeholder: string,
-        ownSpans: [number, number][],
         otherSpans: [number, number][],
     ) {
         const regex = getRegexp(tagName);
-        let idx = 0;
-        return _source.replace(regex, (match, attributes, content) => {
-            if (match.startsWith('<!--') || withinOtherSpan(idx)) {
+        return _source.replace(regex, (match, attributes, content, index) => {
+            if (match.startsWith('<!--') || withinOtherSpan(index)) {
                 return match;
             }
             const encodedContent = Buffer.from(content).toString('base64');
             return `<${tagName}${attributes} ${snippedTagContentAttribute}="${encodedContent}">${placeholder}</${tagName}>`;
         });
 
         function withinOtherSpan(idx: number) {
-            return otherSpans.some(
-                (otherSpan) => ownSpans[idx][0] > otherSpan[0] && ownSpans[idx][1] < otherSpan[1],
-            );
+            return otherSpans.some((otherSpan) => idx > otherSpan[0] && idx < otherSpan[1]);
         }
     }
 

test/printer/samples/script-with-html-comment-and-style.html

@@ -0,0 +1,9 @@
+<script>
+    const abc = "<!-- foo -->";
+</script>
+
+<style>
+    div {
+        color: green;
+    }
+</style>