From 0c77275bdca01622061e124f037a7ecb9f9c6587 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 26 Aug 2021 15:43:11 +0200
Subject: [PATCH] (fix) adjust wrong "is inside other tag" check (#247)

Fixes #244
---
 CHANGELOG.md                                        |  4 ++++
 src/lib/snipTagContent.ts                           | 13 ++++---------
 .../samples/script-with-html-comment-and-style.html |  9 +++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 test/printer/samples/script-with-html-comment-and-style.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb8f1013..f582178c 100644
--- a/CHANGELOG.md
+++ b/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))
diff --git a/src/lib/snipTagContent.ts b/src/lib/snipTagContent.ts
index e3557f56..9e194bce 100644
--- a/src/lib/snipTagContent.ts
+++ b/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,13 +25,11 @@ 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');
@@ -40,9 +37,7 @@ export function snipScriptAndStyleTagContent(source: string): string {
         });
 
         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]);
         }
     }
 
diff --git a/test/printer/samples/script-with-html-comment-and-style.html b/test/printer/samples/script-with-html-comment-and-style.html
new file mode 100644
index 00000000..0b250b89
--- /dev/null
+++ b/test/printer/samples/script-with-html-comment-and-style.html
@@ -0,0 +1,9 @@
+<script>
+    const abc = "<!-- foo -->";
+</script>
+
+<style>
+    div {
+        color: green;
+    }
+</style>