[formatting addon] Don't line-break around inline tags

codemirror · Jan 21, 2013 · e4c42b5 · e4c42b5
1 parent a14e1e9
commit e4c42b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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>