From 55028919bdbf1cb5b68ca2e233b2fe708d0259c9 Mon Sep 17 00:00:00 2001
From: Vlad Minaev <vladislav.minaev@jetbrains.com>
Date: Sun, 19 May 2024 15:59:42 +0300
Subject: [PATCH] WEB-65717 Remove outdated Zen HTML live templates

GitOrigin-RevId: b83629499b4e65f7a2edb8f97121ea920ceb29e4
---
 xml/impl/resources/liveTemplates/zen_html.xml | 58 -------------------
 .../emmet/HtmlEmmetAbbreviationTest.java      |  2 +-
 .../emmet/abbreviation/html.abbreviation.json |  8 +--
 3 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/xml/impl/resources/liveTemplates/zen_html.xml b/xml/impl/resources/liveTemplates/zen_html.xml
index f6ade4bb9885..f7e6d328481c 100644
--- a/xml/impl/resources/liveTemplates/zen_html.xml
+++ b/xml/impl/resources/liveTemplates/zen_html.xml
@@ -1216,14 +1216,6 @@
       <option name="TSX_HTML" value="true"/>
     </context>
   </template>
-  <template description="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;...&lt;/html&gt;" name="html:xml" toReformat="true"
-            toShortenFQNames="true" value="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;$END$&lt;/html&gt;">
-    <context>
-      <option name="HTML_TEXT" value="true"/>
-      <option name="JSX_HTML" value="true"/>
-      <option name="TSX_HTML" value="true"/>
-    </context>
-  </template>
   <template description="&lt;keygen&gt;" name="keygen" toReformat="true" toShortenFQNames="true" value="&lt;keygen&gt;">
     <context>
       <option name="HTML_TEXT" value="true"/>
@@ -1742,56 +1734,6 @@
     </context>
   </template>
   
-  <template description="" name="html:4t" toReformat="true" toShortenFQNames="true"
-            value="&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot; &quot;http://www.w3.org/TR/html4/loose.dtd&quot;&gt;&#10;&lt;html lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;&#10;&lt;title&gt;$TITLE$&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
-    <variable alwaysStopAt="true" defaultValue="&quot;en&quot;" expression="" name="ENV_LANG"/>
-    <variable alwaysStopAt="true" defaultValue="&quot;Document&quot;" expression="" name="TITLE"/>
-    <context>
-      <option name="HTML_TEXT" value="true"/>
-      <option name="JSX_HTML" value="true"/>
-      <option name="TSX_HTML" value="true"/>
-    </context>
-  </template>
-  <template description="" name="html:4s" toReformat="true" toShortenFQNames="true"
-            value="&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01//EN&quot; &quot;http://www.w3.org/TR/html4/strict.dtd&quot;&gt;&#10;&lt;html lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;&#10;&lt;title&gt;$TITLE$&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
-    <variable alwaysStopAt="true" defaultValue="&quot;en&quot;" expression="" name="ENV_LANG"/>
-    <variable alwaysStopAt="true" defaultValue="&quot;Document&quot;" expression="" name="TITLE"/>
-    <context>
-      <option name="HTML_TEXT" value="true"/>
-      <option name="JSX_HTML" value="true"/>
-      <option name="TSX_HTML" value="true"/>
-    </context>
-  </template>
-  <template description="" name="html:xt" toReformat="true" toShortenFQNames="true"
-            value="&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;&#10;&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;&#10;&lt;title&gt;$TITLE$&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
-    <variable alwaysStopAt="true" defaultValue="&quot;en&quot;" expression="" name="ENV_LANG"/>
-    <variable alwaysStopAt="true" defaultValue="&quot;Document&quot;" expression="" name="TITLE"/>
-    <context>
-      <option name="HTML_TEXT" value="true"/>
-      <option name="JSX_HTML" value="true"/>
-      <option name="TSX_HTML" value="true"/>
-    </context>
-  </template>
-  <template description="" name="html:xs" toReformat="true" toShortenFQNames="true"
-            value="&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;&#10;&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;&#10;&lt;title&gt;$TITLE$&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
-    <variable alwaysStopAt="true" defaultValue="&quot;en&quot;" expression="" name="ENV_LANG"/>
-    <variable alwaysStopAt="true" defaultValue="&quot;Document&quot;" expression="" name="TITLE"/>
-    <context>
-      <option name="HTML_TEXT" value="true"/>
-      <option name="JSX_HTML" value="true"/>
-      <option name="TSX_HTML" value="true"/>
-    </context>
-  </template>
-  <template description="" name="html:xxs" toReformat="true" toShortenFQNames="true"
-            value="&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.1//EN&quot; &quot;http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd&quot;&gt;&#10;&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;&#10;&lt;title&gt;$TITLE$&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
-    <variable alwaysStopAt="true" defaultValue="&quot;en&quot;" expression="" name="ENV_LANG"/>
-    <variable alwaysStopAt="true" defaultValue="&quot;Document&quot;" expression="" name="TITLE"/>
-    <context>
-      <option name="HTML_TEXT" value="true"/>
-      <option name="JSX_HTML" value="true"/>
-      <option name="TSX_HTML" value="true"/>
-    </context>
-  </template>
   <template description="" name="html:5" toReformat="true" toShortenFQNames="true"
             value="&lt;!doctype html&gt;&#10;&lt;html lang=&quot;$ENV_LOCALE$&quot;&gt;&#10;&lt;head&gt;&#10;&lt;meta charset=&quot;$CHARSET$&quot;&gt;&#10;
             &lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1&quot;&gt;&#10;
diff --git a/xml/tests/src/com/intellij/codeInsight/template/emmet/HtmlEmmetAbbreviationTest.java b/xml/tests/src/com/intellij/codeInsight/template/emmet/HtmlEmmetAbbreviationTest.java
index f31797ed979b..b3300076012d 100644
--- a/xml/tests/src/com/intellij/codeInsight/template/emmet/HtmlEmmetAbbreviationTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/template/emmet/HtmlEmmetAbbreviationTest.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 
 /**
  * Tests from https://github.com/emmetio/emmet/blob/master/test/expandAbbreviation.js
- * and from https://github.com/emmetio/emmet/blob/master/lib/snippets.json
+ * and from https://github.com/emmetio/emmet/blob/master/src/snippets/css.json
  *
  * The new one: https://github.com/emmetio/snippets/blob/047c644a3d29f75f7cbb8183ebb91ab3fbcd143b/html.json
  */
diff --git a/xml/tests/testData/codeInsight/template/emmet/abbreviation/html.abbreviation.json b/xml/tests/testData/codeInsight/template/emmet/abbreviation/html.abbreviation.json
index 702041b4e35d..10876a7c2859 100644
--- a/xml/tests/testData/codeInsight/template/emmet/abbreviation/html.abbreviation.json
+++ b/xml/tests/testData/codeInsight/template/emmet/abbreviation/html.abbreviation.json
@@ -93,7 +93,6 @@
   "menu:t|menu:toolbar": "menu[type=toolbar]",
   "video": "video[src]",
   "audio": "audio[src]",
-  "html:xml": "html[xmlns=http://www.w3.org/1999/xhtml]",
   "keygen": "keygen/",
   "command": "command/",
   "btn:s|button:s|button:submit" : "button[type=submit]",
@@ -105,12 +104,7 @@
   "ri:v|ri:viewport": "img:z",
   "ri:a|ri:art": "pic>src:m+img",
   "ri:t|ri:type": "pic>src:t+img",
-  
-  "html:4t": "!!!4t+doc4[lang=en]",
-  "html:4s": "!!!4s+doc4[lang=en]",
-  "html:xt": "!!!xt+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]",
-  "html:xs": "!!!xs+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]",
-  "html:xxs": "!!!xxs+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]",
+
   "html:5": "!!!+doc",
 
   "bq": "blockquote",