From af2ac0bad5512067d13f14893025e54d7afec2f0 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Thu, 21 Mar 2019 15:37:30 +0300
Subject: [PATCH] IDEA-203679 JSP tags removed inside "application/ld+json"
 scripts when formatting JSP file

skipping jsp markup when injecting into <script> tag
---
 .../source/html/HtmlScriptLanguageInjector.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlScriptLanguageInjector.java b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlScriptLanguageInjector.java
index c47ee240bb4a..467998d6e04e 100644
--- a/xml/impl/src/com/intellij/psi/impl/source/html/HtmlScriptLanguageInjector.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/html/HtmlScriptLanguageInjector.java
@@ -19,9 +19,9 @@ import com.intellij.lang.Language;
 import com.intellij.lang.LanguageUtil;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.lang.injection.MultiHostRegistrar;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
+import com.intellij.psi.templateLanguages.OuterLanguageElement;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
 import com.intellij.xml.util.HtmlUtil;
@@ -71,10 +71,13 @@ public class HtmlScriptLanguageInjector implements MultiHostInjector {
     }
 
     if (LanguageUtil.isInjectableLanguage(language)) {
-      registrar
-        .startInjecting(language)
-        .addPlace(null, null, (PsiLanguageInjectionHost)host, TextRange.create(0, host.getTextLength()))
-        .doneInjecting();
+      registrar.startInjecting(language);
+      for (PsiElement child : host.getChildren()) {
+        if (!(child instanceof OuterLanguageElement)) {
+          registrar.addPlace(null, null, (PsiLanguageInjectionHost)host, child.getTextRangeInParent());
+        }
+      }
+      registrar.doneInjecting();
     }
   }