workaround for xml weirdness

nightwing · nightwing · commit 6f98ce52d7a1 · 2015-06-26T08:29:10.000+04:00
diff --git a/demo/svg.svg b/demo/svg.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css"> #ed { width: 500px; height: 200px }</style>
+    <script xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../build/src/ace.js"></script>
+    <script type="text/javascript">
+        window.onload = function() {
+            ace.edit("ed");
+         };</script>
+    <foreignObject id="fo" width="500px" height="200px">
+        <div xmlns="http://www.w3.org/1999/xhtml" id="ed">Hi!</div>
+    </foreignObject>
+</svg>
diff --git a/demo/xml.xml b/demo/xml.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+    <meta charset="UTF-8"></meta>
+    <title>ACE Autocompletion demo</title>
+    <style type="text/css" media="screen">
+        body { overflow: hidden; }
+        #editor {
+            margin: 0; position: absolute;
+            top: 0; bottom: 0; left: 0; right: 0;
+        }
+    </style>
+</head>
+<body>
+    <pre id="editor"></pre>
+
+    <script src="kitchen-sink/require.js"></script>
+    <script><![CDATA[
+    // setup paths
+    require.config({paths: { "ace" : "../lib/ace"}});
+    // load ace and extensions
+    require(["ace/ace", "ace/ext/language_tools"], function(ace) {
+        var langagueTools = require("ace/ext/language_tools");
+        var editor = ace.edit("editor");
+        editor.session.setMode("ace/mode/xml");
+        editor.setTheme("ace/theme/tomorrow");
+    });    
+    ]]></script>
+
+    <script src="./show_own_source.js"></script>
+</body>
+</html>
diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
@@ -321,7 +321,7 @@ var Text = function(parentEl) {
 
     this.$renderToken = function(stringBuilder, screenColumn, token, value) {
         var self = this;
-        var replaceReg = /\t|&|<|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\u3000\uFEFF])|[\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3000-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]/g;
+        var replaceReg = /\t|&|<|>|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\u3000\uFEFF])|[\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3000-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]/g;
         var replaceFunc = function(c, a, b, tabIdx, idx4) {
             if (a) {
                 return self.showInvisibles
@@ -331,6 +331,9 @@ var Text = function(parentEl) {
                 return "&#38;";
             } else if (c == "<") {
                 return "&#60;";
+            } else if (c == ">") {
+                // normally escaping this is not needed, but xml documents throw error when setting innerHTML to ]]>
+                return "&#62;";
             } else if (c == "\t") {
                 var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx);
                 screenColumn += tabSize - 1;
