From e4c42b562d94dfe3f22c31ba9db70c10fa5dbd7f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Jan 2013 11:24:59 +0100
Subject: [PATCH] [formatting addon] Don't line-break around inline tags

---
 addon/format/formatting.js | 10 ++++++++--
 demo/formatting.html       |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addon/format/formatting.js b/addon/format/formatting.js
index 25ee1531a8..88b84307f6 100644
--- a/addon/format/formatting.js
+++ b/addon/format/formatting.js
@@ -22,11 +22,17 @@
     }
   });
 
+  var inlineElements = /^(a|abbr|acronym|area|base|bdo|big|br|button|caption|cite|code|col|colgroup|dd|del|dfn|em|frame|hr|iframe|img|input|ins|kbd|label|legend|link|map|object|optgroup|option|param|q|samp|script|select|small|span|strong|sub|sup|textarea|tt|var)$/;
+
   CodeMirror.extendMode("xml", {
     commentStart: "<!--",
     commentEnd: "-->",
-    newlineAfterToken: function(type, content, textAfter) {
-      return type == "tag" && />$/.test(content) || /^</.test(textAfter);
+    newlineAfterToken: function(type, content, textAfter, state) {
+      var inline = false;
+      if (this.configuration == "html")
+        inline = state.context ? inlineElements.test(state.context.tagName) : false;
+      return !inline && ((type == "tag" && />$/.test(content) && state.context) ||
+                         /^</.test(textAfter));
     }
   });
 
diff --git a/demo/formatting.html b/demo/formatting.html
index 5d2f4b40fc..e06bc355e2 100644
--- a/demo/formatting.html
+++ b/demo/formatting.html
@@ -29,7 +29,7 @@ <h1>CodeMirror: Formatting demo</h1>
 function test(c){  for (var i = 0; i < 10; i++){	          process("a.b();c = null;", 300);}
 }
 </script>
-<table><tr><td>test 1</td></tr><tr><td>test 2</td></tr></table>
+<table><tr><td>test 1</td></tr><tr><td>test <strong>2</strong></td></tr></table>
 <script> function test() { return 1;} </script>
 <style> .test { font-size: medium; font-family: monospace; }
 </style></textarea></form>