From 81a17e005031cb5f682e1813cc262f96e0f10fa1 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Thu, 21 Mar 2019 21:04:22 +0300
Subject: [PATCH] treat small as inline tag (WEB-14791)

---
 .../platform-tests/testData/codeStyle/json/exportToJson.json  | 1 +
 .../com/intellij/psi/formatter/xml/HtmlCodeStyleSettings.java | 2 +-
 .../src/com/intellij/psi/formatter/HtmlFormatterTest.java     | 4 ++++
 xml/tests/testData/psi/formatter/html/small.html              | 1 +
 xml/tests/testData/psi/formatter/html/small_after.html        | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 xml/tests/testData/psi/formatter/html/small.html
 create mode 100644 xml/tests/testData/psi/formatter/html/small_after.html

diff --git a/platform/platform-tests/testData/codeStyle/json/exportToJson.json b/platform/platform-tests/testData/codeStyle/json/exportToJson.json
index 8e96a0bb1a32..75dad39a3ec0 100644
--- a/platform/platform-tests/testData/codeStyle/json/exportToJson.json
+++ b/platform/platform-tests/testData/codeStyle/json/exportToJson.json
@@ -74,6 +74,7 @@
         "s",
         "samp",
         "select",
+        "small",
         "span",
         "strike",
         "strong",
diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/HtmlCodeStyleSettings.java b/xml/impl/src/com/intellij/psi/formatter/xml/HtmlCodeStyleSettings.java
index d3498ec60a81..daa94a56238a 100644
--- a/xml/impl/src/com/intellij/psi/formatter/xml/HtmlCodeStyleSettings.java
+++ b/xml/impl/src/com/intellij/psi/formatter/xml/HtmlCodeStyleSettings.java
@@ -64,7 +64,7 @@ public class HtmlCodeStyleSettings extends CustomCodeStyleSettings {
   @Property(externalName = "inline_tags")
   @CommaSeparatedValues
   @NonNls public String HTML_INLINE_ELEMENTS =
-    "a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,span,strike,strong,sub,sup,textarea,tt,u,var";
+    "a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var";
 
   @Property(externalName = "do_not_break_if_inline_tags")
   @CommaSeparatedValues
diff --git a/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java b/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java
index e0628e403bbb..2c03e05c4009 100644
--- a/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java
+++ b/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java
@@ -205,6 +205,10 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     doTest();
   }
 
+  public void testSmall() throws Exception {
+    doTest();
+  }
+
   public void testTableformatting() throws Exception {
     doTest();
   }
diff --git a/xml/tests/testData/psi/formatter/html/small.html b/xml/tests/testData/psi/formatter/html/small.html
new file mode 100644
index 000000000000..598f7026ea4a
--- /dev/null
+++ b/xml/tests/testData/psi/formatter/html/small.html
@@ -0,0 +1 @@
+<div><small>Hello!</small></div>
\ No newline at end of file
diff --git a/xml/tests/testData/psi/formatter/html/small_after.html b/xml/tests/testData/psi/formatter/html/small_after.html
new file mode 100644
index 000000000000..598f7026ea4a
--- /dev/null
+++ b/xml/tests/testData/psi/formatter/html/small_after.html
@@ -0,0 +1 @@
+<div><small>Hello!</small></div>
\ No newline at end of file