From d4a46aa46771d25c81d6a215b6ab56ce9282c96a Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Fri, 18 Mar 2011 22:25:39 +0100
Subject: [PATCH 01/26] Use getStringScreenWidth in Session.computeWidth

---
 lib/ace/edit_session.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 6c33c449..6ccb6a91 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -348,16 +348,16 @@ var EditSession = function(text, mode) {
     this.setUseWorker = function(useWorker) {
         if (this.$useWorker == useWorker)
             return;
-            
+
         if (useWorker && !this.$worker && window.Worker)
             this.$worker = mode.createWorker(this);
-            
+
         if (!useWorker && this.$worker) {
             this.$worker.terminate();
             this.$worker = null;
         }
     };
-    
+
     this.getUseWorker = function() {
         return this.$useWorker;
     };
@@ -417,14 +417,11 @@ var EditSession = function(text, mode) {
             var tabSize = this.getTabSize();
 
             for ( var i = 0; i < lines.length; i++) {
-                var len = lines[i].length;
+                var line = lines[i],
+                    len = line.length,
+                    screenLen = this.$getStringScreenWidth(line);
                 longestLine = Math.max(longestLine, len);
-
-                lines[i].replace(/\t/g, function(m) {
-                    len += tabSize-1;
-                    return m;
-                });
-                longestScreenLine = Math.max(longestScreenLine, len);
+                longestScreenLine = Math.max(longestScreenLine, screenLen);
             }
             this.width = longestLine;
 
@@ -601,7 +598,7 @@ var EditSession = function(text, mode) {
 
 
         var actions = [{}];
-        
+
         // collapse insert and remove operations
         for (var i=0; i<deltas.length; i++) {
             var delta = deltas[i];
@@ -615,7 +612,7 @@ var EditSession = function(text, mode) {
                 })
             }
             else {
-                if (isInsert)    
+                if (isInsert)
                     action.end = delta.range.end;
                 else
                     action.start = delta.range.start;
@@ -625,12 +622,12 @@ var EditSession = function(text, mode) {
         // update selection based on last operation
         this.selection.clearSelection();
         var action = actions[actions.length-1];
-        if (action.isInsert) 
+        if (action.isInsert)
             this.selection.setSelectionRange(Range.fromPoints(action.start, action.end));
-        else 
+        else
             this.selection.moveCursorToPosition(action.end);
     },
-    
+
     this.replace = function(range, text) {
         return this.doc.replace(range, text);
     };
@@ -988,7 +985,7 @@ var EditSession = function(text, mode) {
     this.$getStringScreenWidth = function(str) {
         var screenColumn = 0;
         var tabSize = this.getTabSize();
-		
+
 		for (var i=0; i<str.length; i++) {
 			var c = str.charCodeAt(i);
 			// tab
@@ -1008,7 +1005,7 @@ var EditSession = function(text, mode) {
 				screenColumn += 1;
 			}
 		}
-		
+
 		return screenColumn;
     }
 

From 1a5a071c7d01ea4e45704ceca9042cbbe28f3665 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Fri, 18 Mar 2011 23:30:25 +0100
Subject: [PATCH 02/26] First iteration of implementing real real tabs

---
 lib/ace/edit_session.js | 19 +++++++++++--
 lib/ace/layer/text.js   | 63 ++++++++++++++++++++++++++++++-----------
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 6ccb6a91..ed84f009 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -944,13 +944,14 @@ var EditSession = function(text, mode) {
 
     this.$getDisplayTokens = function(str) {
         var arr = [];
-        var tabSize = this.getTabSize();
+        var tabSize;
 
         for (var i = 0; i < str.length; i++) {
 			var c = str.charCodeAt(i);
 			// Tab
 			if (c == 9) {
 			    arr.push(TAB);
+                tabSize = this.getScreenTabSize(arr.length);
 			    for (var n = 1; n < tabSize; n++) {
 			        arr.push(TAB_SPACE);
 			    }
@@ -990,7 +991,7 @@ var EditSession = function(text, mode) {
 			var c = str.charCodeAt(i);
 			// tab
 			if (c == 9) {
-				screenColumn += tabSize;
+				screenColumn += this.getScreenTabSize(screenColumn);
 			}
     		// CJK characters
             else if (
@@ -1103,6 +1104,13 @@ var EditSession = function(text, mode) {
         return this.screenToDocumentPosition(screenRow, screenColumn).column;
     };
 
+    /**
+     * Returns the width of a tab character at screenColumn.
+     */
+    this.getScreenTabSize = function(screenColumn) {
+        return this.$tabSize - screenColumn % this.$tabSize;
+    };
+
     this.screenToDocumentPosition = function(row, column) {
         var line;
         var docRow;
@@ -1131,7 +1139,8 @@ var EditSession = function(text, mode) {
             line = this.getLine(docRow).substring(docColumn);
         }
 
-        var tabSize = this.getTabSize();
+        var tabSize,
+            screenColumn = 0;
         for(var i = 0; i < line.length; i++) {
             var c = line.charCodeAt(i);
 
@@ -1139,8 +1148,10 @@ var EditSession = function(text, mode) {
                 docColumn += 1;
                 // tab
                 if (c == 9) {
+                    tabSize = this.getScreenTabSize(screenColumn);
                     if (remaining >= tabSize) {
                         remaining -= tabSize;
+                        screenColumn += tabSize;
                     } else {
                         remaining = 0;
                         docColumn -= 1;
@@ -1154,6 +1165,7 @@ var EditSession = function(text, mode) {
                     c >= 0xF900 && c <= 0xFAFF ||
                     c >= 0x3400 && c <= 0x4DBF
                 ) {
+                    screenColumn += 2;
                     if (remaining >= 2) {
                         remaining -= 2;
                     } else {
@@ -1161,6 +1173,7 @@ var EditSession = function(text, mode) {
                         docColumn -= 1;
                     }
                 } else {
+                    screenColumn += 2;
                     remaining -= 1;
                 }
             } else {
diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 43f24baa..7c22548f 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -160,18 +160,21 @@ var Text = function(parentEl) {
         return true;
     };
 
+    this.$tabStrings = [];
     this.$computeTabString = function() {
         var tabSize = this.session.getTabSize();
-        if (this.showInvisibles) {
-            var halfTab = (tabSize) / 2;
-            this.$tabString = "<span class='ace_invisible'>"
-                + new Array(Math.floor(halfTab)).join("&#160;")
-                + this.TAB_CHAR
-                + new Array(Math.ceil(halfTab)+1).join("&#160;")
-                + "</span>";
-        } else {
-            this.$tabString = new Array(tabSize+1).join("&#160;");
+        var tabStr = this.$tabStrings = [0];
+        for (var i = 1; i < tabSize + 1; i++) {
+            if (this.showInvisibles) {
+                tabStr.push("<span class='ace_invisible'>"
+                    + this.TAB_CHAR
+                    + new Array(i).join("&#160;")
+                    + "</span>");
+            } else {
+                tabStr.push(new Array(i+1).join("&#160;"));
+            }
         }
+
     };
 
     this.updateLines = function(config, firstRow, lastRow) {
@@ -295,17 +298,41 @@ var Text = function(parentEl) {
             var spaceReplace = "&#160;";
         }
 
-        var _self = this;
-        var characterWidth = this.config.characterWidth;
+        var _self = this,
+            characterWidth = this.config.characterWidth,
+            screenColumn = 0;
+
         function addToken(token, value) {
             var output = value
-                .replace(/&/g, "&amp;")
-                .replace(/</g, "&lt;")
+                    .replace(/\t|&|<|[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c, idx) {
+                        if (c == "\t") {
+                            var tabSize = _self.session.
+                                    getScreenTabSize(screenColumn + idx);
+                            screenColumn += tabSize - 1;
+                            return _self.$tabStrings[tabSize];
+                        } else if (c == "&") {
+                            return "&amp";
+                        } else if (c == "<") {
+                            return "&lt;";
+                        } else {
+                            screenColumn += 1;
+                            return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
+                        }
+                    })
+//                .replace(/\t/g, function(c, idx) {
+//                    idx += screenColumnOld;
+//                    var tabSize = _self.session.getScreenTabSize(idx);
+//                    screenColumn += tabSize - 1;
+//                    return _self.$tabStrings[tabSize];
+//                })
+//                .replace(/&/g, "&amp;")
+//                .replace(/</g, "&lt;")
                 .replace(spaceRe, spaceReplace)
-                .replace(/\t/g, _self.$tabString)
-                .replace(/[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c) {
-                    return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
-                });
+//                .replace(/[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c) {
+//                    screenColumn += 1;
+//                    return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
+//                });
+                screenColumn += value.length;
 
             if (!_self.$textToken[token.type]) {
                 var classes = "ace_" + token.type.replace(/\./g, " ace_");
@@ -344,7 +371,9 @@ var Text = function(parentEl) {
                         "<div style='height:",
                         this.config.lineHeight, "px",
                         "'>");
+
                     split ++;
+                    screenColumn = 0;
                     splitChars = splits[split] || Number.MAX_VALUE;
                 }
                 if (value.length != 0) {

From d1bfdba34b7587af0092f3a3bee1a9e989de4ad9 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 00:34:35 +0100
Subject: [PATCH 03/26] Fixed some bugs and unit tests pass again

---
 lib/ace/edit_session.js           | 10 ++++----
 lib/ace/selection.js              | 33 +++++++++++----------------
 lib/ace/test/edit_session_test.js | 38 +++++++++++++++++++------------
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index ed84f009..536d9784 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -896,9 +896,9 @@ var EditSession = function(text, mode) {
             // and multipleWidth characters.
             var len = displayed.length;
             displayed.join("").
-                // Get all the tabs.
-                replace(/4/g, function(m) {
-                    len -= tabSize - 1;
+                // Get all the tabs spaces.
+                replace(/5/g, function(m) {
+                    len -= 1;
                 }).
                 // Get all the multipleWidth characters.
                 replace(/2/g, function(m) {
@@ -950,8 +950,8 @@ var EditSession = function(text, mode) {
 			var c = str.charCodeAt(i);
 			// Tab
 			if (c == 9) {
-			    arr.push(TAB);
                 tabSize = this.getScreenTabSize(arr.length);
+			    arr.push(TAB);
 			    for (var n = 1; n < tabSize; n++) {
 			        arr.push(TAB_SPACE);
 			    }
@@ -1173,7 +1173,7 @@ var EditSession = function(text, mode) {
                         docColumn -= 1;
                     }
                 } else {
-                    screenColumn += 2;
+                    screenColumn += 1;
                     remaining -= 1;
                 }
             } else {
diff --git a/lib/ace/selection.js b/lib/ace/selection.js
index 5c2a45bb..1be40c41 100644
--- a/lib/ace/selection.js
+++ b/lib/ace/selection.js
@@ -50,7 +50,7 @@ var Selection = function(session) {
     this.clearSelection();
     this.selectionLead = this.doc.createAnchor(0, 0);
     this.selectionAnchor = this.doc.createAnchor(0, 0);
-    
+
     var _self = this;
     this.selectionLead.on("change", function(e) {
         _self._dispatchEvent("changeCursor");
@@ -59,7 +59,7 @@ var Selection = function(session) {
         if (e.old.row == e.value.row)
             _self.$updateDesiredColumn();
     });
-    
+
     this.selectionAnchor.on("change", function() {
         if (!_self.$isEmpty)
             _self._dispatchEvent("changeSelection");
@@ -382,19 +382,14 @@ var Selection = function(session) {
     };
 
     this.moveCursorBy = function(rows, chars) {
-        if (this.session.getUseWrapMode()) {
-            var screenPos = this.session.documentToScreenPosition(
-                this.selectionLead.row, 
-                this.selectionLead.column
-            );
-            var screenCol = (chars == 0 && this.$desiredColumn) || screenPos.column;
-            var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
-            
-            this.moveCursorTo(docPos.row, docPos.column + chars, chars == 0);
-        } else {
-            var docColumn = (chars == 0 && this.$desiredColumn) || this.selectionLead.column;
-            this.moveCursorTo(this.selectionLead.row + rows, docColumn + chars, chars == 0);
-        }
+        var screenPos = this.session.documentToScreenPosition(
+            this.selectionLead.row,
+            this.selectionLead.column
+        );
+        var screenCol = (chars == 0 && this.$desiredColumn) || screenPos.column;
+        var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
+
+        this.moveCursorTo(docPos.row, docPos.column + chars, chars == 0);
     };
 
     this.moveCursorToPosition = function(position) {
@@ -408,11 +403,9 @@ var Selection = function(session) {
     };
 
     this.moveCursorToScreen = function(row, column, preventUpdateDesiredColumn) {
-        if (this.session.getUseWrapMode()) {
-            var pos = this.session.screenToDocumentPosition(row, column);
-            row = pos.row;
-            column = pos.column;
-        }
+        var pos = this.session.screenToDocumentPosition(row, column);
+        row = pos.row;
+        column = pos.column;
         this.moveCursorTo(row, column, preventUpdateDesiredColumn);
     };
 
diff --git a/lib/ace/test/edit_session_test.js b/lib/ace/test/edit_session_test.js
index 3cb061bb..0e6f4663 100644
--- a/lib/ace/test/edit_session_test.js
+++ b/lib/ace/test/edit_session_test.js
@@ -140,18 +140,19 @@ var Test = {
         assert.equal(session.documentToScreenColumn(0, 0), 0);
         assert.equal(session.documentToScreenColumn(0, 4), 4);
         assert.equal(session.documentToScreenColumn(0, 5), 5);
-        assert.equal(session.documentToScreenColumn(0, 6), 9);
-        assert.equal(session.documentToScreenColumn(0, 12), 15);
-        assert.equal(session.documentToScreenColumn(0, 13), 19);
+        assert.equal(session.documentToScreenColumn(0, 6), 8);
+        assert.equal(session.documentToScreenColumn(0, 12), 14);
+        assert.equal(session.documentToScreenColumn(0, 13), 16);
 
         session.setTabSize(2);
 
         assert.equal(session.documentToScreenColumn(0, 0), 0);
         assert.equal(session.documentToScreenColumn(0, 4), 4);
         assert.equal(session.documentToScreenColumn(0, 5), 5);
-        assert.equal(session.documentToScreenColumn(0, 6), 7);
-        assert.equal(session.documentToScreenColumn(0, 12), 13);
-        assert.equal(session.documentToScreenColumn(0, 13), 15);
+        assert.equal(session.documentToScreenColumn(0, 6), 6);
+        assert.equal(session.documentToScreenColumn(0, 7), 7);
+        assert.equal(session.documentToScreenColumn(0, 12), 12);
+        assert.equal(session.documentToScreenColumn(0, 13), 14);
     },
 
     "test: convert document to screen coordinates with leading tabs": function() {
@@ -179,7 +180,7 @@ var Test = {
         session.setUseWrapMode(true);
         session.setWrapLimitRange(2, 2);
         session.adjustWrapLimit(80);
-        
+
         assert.position(session.documentToScreenPosition(0, 1), 1, 0);
         assert.position(session.documentToScreenPosition(0, 2), 2, 0);
         assert.position(session.documentToScreenPosition(0, 4), 2, 1);
@@ -194,10 +195,20 @@ var Test = {
         assert.equal(session.screenToDocumentColumn(0, 5), 5);
         assert.equal(session.screenToDocumentColumn(0, 6), 5);
         assert.equal(session.screenToDocumentColumn(0, 7), 5);
-        assert.equal(session.screenToDocumentColumn(0, 8), 5);
-        assert.equal(session.screenToDocumentColumn(0, 9), 6);
+        assert.equal(session.screenToDocumentColumn(0, 8), 6);
+        assert.equal(session.screenToDocumentColumn(0, 9), 7);
         assert.equal(session.screenToDocumentColumn(0, 15), 12);
-        assert.equal(session.screenToDocumentColumn(0, 19), 13);
+        assert.equal(session.screenToDocumentColumn(0, 19), 16);
+
+        session.setTabSize(2);
+
+        assert.equal(session.screenToDocumentColumn(0, 0), 0);
+        assert.equal(session.screenToDocumentColumn(0, 4), 4);
+        assert.equal(session.screenToDocumentColumn(0, 5), 5);
+        assert.equal(session.screenToDocumentColumn(0, 6), 6);
+        assert.equal(session.screenToDocumentColumn(0, 12), 12);
+        assert.equal(session.screenToDocumentColumn(0, 13), 12);
+        assert.equal(session.screenToDocumentColumn(0, 14), 13);
     },
 
     "test: screenToDocument with soft wrap and multi byte characters": function() {
@@ -217,7 +228,7 @@ var Test = {
         session = new EditSession(["ぁ a"]);
         session.setUseWrapMode(true);
         session.adjustWrapLimit(80);
-        
+
         assert.position(session.screenToDocumentPosition(0, 1), 0, 0);
         assert.position(session.screenToDocumentPosition(0, 2), 0, 1);
         assert.position(session.screenToDocumentPosition(0, 3), 0, 2);
@@ -227,13 +238,12 @@ var Test = {
 
     "test: wrapLine split function" : function() {
         var splits;
-        var computeWrapSplits = EditSession.prototype.$computeWrapSplits;
         var c = 0;
 
         function computeAndAssert(line, assertEqual, wrapLimit, tabSize) {
             wrapLimit = wrapLimit || 12;
             tabSize = tabSize || 4;
-            splits = computeWrapSplits.call(EditSession.prototype, line, wrapLimit, tabSize);
+            var splits = EditSession.prototype.$computeWrapSplits(line, wrapLimit, tabSize);
             // console.log("String:", line, "Result:", splits, "Expected:", assertEqual);
             assert.ok(splits.length == assertEqual.length);
             for (var i = 0; i < splits.length; i++) {
@@ -297,7 +307,7 @@ var Test = {
 
         assert.equal(session.$getDisplayTokens("\t").length, 4);
         assert.equal(session.$getDisplayTokens("abc").length, 3);
-        assert.equal(session.$getDisplayTokens("abc\t").length, 7);
+        assert.equal(session.$getDisplayTokens("abc\t").length, 4);
     },
 
     "test issue 83": function() {

From a8a1d9483b36ceed3715d23c55836a88aae4672b Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 00:54:35 +0100
Subject: [PATCH 04/26] Moving replacing of spaces into big replace function to
 avoid replacements of <span ...>tab</span>

---
 lib/ace/layer/text.js | 48 ++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 7c22548f..7d4f845b 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -280,58 +280,36 @@ var Text = function(parentEl) {
     };
 
     this.$renderLine = function(stringBuilder, row, tokens) {
-        if (this.showInvisibles) {
-            var self = this;
-            var spaceRe = /( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])/g;
-            var spaceReplace = function(space) {
-                if (space.charCodeAt(0) == 32)
-                    return new Array(space.length+1).join("&#160;");
-                else {
-                    var space = new Array(space.length+1).join(self.SPACE_CHAR);
-                    return "<span class='ace_invisible'>" + space + "</span>";
-                }
-
-            };
-        }
-        else {
-            var spaceRe = /[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/g;
-            var spaceReplace = "&#160;";
-        }
-
         var _self = this,
             characterWidth = this.config.characterWidth,
             screenColumn = 0;
 
         function addToken(token, value) {
             var output = value
-                    .replace(/\t|&|<|[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c, idx) {
-                        if (c == "\t") {
+                    .replace(/\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c, a, b, tabIdx, idx4) {
+                        if (c.charCodeAt(0) == 32) {
+                            return new Array(c.length+1).join("&#160;");
+                        } else if (c == "\t") {
                             var tabSize = _self.session.
-                                    getScreenTabSize(screenColumn + idx);
+                                    getScreenTabSize(screenColumn + tabIdx);
                             screenColumn += tabSize - 1;
                             return _self.$tabStrings[tabSize];
                         } else if (c == "&") {
                             return "&amp";
                         } else if (c == "<") {
                             return "&lt;";
+                        } else if (c.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)) {
+                            if (this.showInvisibles) {
+                                var space = new Array(c.length+1).join(self.SPACE_CHAR);
+                                return "<span class='ace_invisible'>" + space + "</span>";
+                            } else {
+                                return "&#160;"
+                            }
                         } else {
                             screenColumn += 1;
                             return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
                         }
-                    })
-//                .replace(/\t/g, function(c, idx) {
-//                    idx += screenColumnOld;
-//                    var tabSize = _self.session.getScreenTabSize(idx);
-//                    screenColumn += tabSize - 1;
-//                    return _self.$tabStrings[tabSize];
-//                })
-//                .replace(/&/g, "&amp;")
-//                .replace(/</g, "&lt;")
-                .replace(spaceRe, spaceReplace)
-//                .replace(/[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c) {
-//                    screenColumn += 1;
-//                    return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
-//                });
+                    });
                 screenColumn += value.length;
 
             if (!_self.$textToken[token.type]) {

From 63d7ba443982759c2090601ca14bfb52babec675 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 14:14:06 +0100
Subject: [PATCH 05/26] Add 'softTab' option to demo

---
 demo/demo.js | 20 ++++++++++++--------
 index.html   | 28 ++++++++++++++++------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/demo/demo.js b/demo/demo.js
index b2bc257a..2655a4c1 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -139,7 +139,7 @@ exports.launch = function(env) {
     docs.svg = new EditSession(document.getElementById("svgtext").innerHTML.replace("&lt;", "<"));
     docs.svg.setMode(new SvgMode());
     docs.svg.setUndoManager(new UndoManager());
-    
+
     docs.textile = new EditSession(document.getElementById("textiletext").innerHTML);
     docs.textile.setMode(new TextileMode());
     docs.textile.setUndoManager(new UndoManager());
@@ -301,6 +301,10 @@ exports.launch = function(env) {
         env.editor.renderer.setHScrollBarAlwaysVisible(checked);
     });
 
+    bindCheckbox("soft_tab", function(checked) {
+        env.editor.getSession().setUseSoftTabs(checked);
+    });
+
     function bindCheckbox(id, callback) {
         var el = document.getElementById(id);
         var onCheck = function() {
@@ -383,11 +387,11 @@ exports.launch = function(env) {
     });
 
     window.env = env;
-    
+
     /**
      * This demonstrates how you can define commands and bind shortcuts to them.
      */
-    
+
     // Command to focus the command line from the editor.
     canon.addCommand({
         name: "focuscli",
@@ -400,7 +404,7 @@ exports.launch = function(env) {
             env.cli.cliView.element.focus();
         }
     });
-    
+
     // Command to focus the editor line from the command line.
     canon.addCommand({
         name: "focuseditor",
@@ -413,7 +417,7 @@ exports.launch = function(env) {
             env.editor.focus();
         }
     });
-    
+
     // Fake-Save, works from the editor and the command line.
     canon.addCommand({
         name: "save",
@@ -426,7 +430,7 @@ exports.launch = function(env) {
             alert("Fake Save File");
         }
     });
-    
+
     // Fake-Print with custom lookup-sender-match function.
     canon.addCommand({
         name: "save",
@@ -435,9 +439,9 @@ exports.launch = function(env) {
             mac: "Command-P",
             sender: function(env, sender, hashId, keyString) {
                 if (sender == "editor") {
-                    return true;   
+                    return true;
                 } else {
-                    alert("Sorry, can only print from the editor");                    
+                    alert("Sorry, can only print from the editor");
                 }
             }
         },
diff --git a/index.html b/index.html
index 60703dd5..4cdac4cd 100644
--- a/index.html
+++ b/index.html
@@ -71,7 +71,7 @@
       </td>
       <td align="right">
         <label for="show_hidden">Show Invisibles</label>
-        <input type="checkbox" name="show_hidden" id="show_hidden">
+        <input type="checkbox" name="show_hidden" id="show_hidden" checked>
       </td>
       <td align="right">
         <label for="show_hscroll">Persistent HScroll</label>
@@ -128,6 +128,10 @@
         <label for="show_print_margin">Show Print Margin</label>
         <input type="checkbox" id="show_print_margin" checked>
       </td>
+      <td align="right">
+        <label for="soft_tab">Use Soft Tab:</label>
+        <input type="checkbox" id="soft_tab" checked>
+      </td>
       <td align="right">
         <label for="highlight_selected_word">Highlight selected word</label>
         <input type="checkbox" id="highlight_selected_word" checked>
@@ -144,7 +148,7 @@
     <script type="text/editor" id="jstext">function foo(items) {
     for (var i=0; i<items.length; i++) {
         alert(items[i] + "juhu");
-    }
+    }	// Real Tab.
 }
 // A magic character: >> ぁ <<
 </script>
@@ -329,8 +333,8 @@ print "\n";
 
 </script>
 
-<script type="text/editor" id="svgtext"><svg 
-  width="800" height="600" 
+<script type="text/editor" id="svgtext"><svg
+  width="800" height="600"
   xmlns="http://www.w3.org/2000/svg"
   onload="StartAnimation(evt)">
 
@@ -380,14 +384,14 @@ print "\n";
     window.ShowAndGrowElement = ShowAndGrowElement
   ]]>&lt;/script>
 
-  <rect 
-    fill="#2e3436" 
-    fill-rule="nonzero" 
-    stroke-width="3" 
-    y="0" 
-    x="0" 
-    height="600" 
-    width="800" 
+  <rect
+    fill="#2e3436"
+    fill-rule="nonzero"
+    stroke-width="3"
+    y="0"
+    x="0"
+    height="600"
+    width="800"
     id="rect3590"/>
 
     <text

From 86851d5a59d66d9f20e11699fa3368a6b3fbb5cf Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 14:26:14 +0100
Subject: [PATCH 06/26] Remove not used getDisplayLine() function and convert
 tabs to spaces

---
 lib/ace/edit_session.js | 75 ++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 42 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 536d9784..6627130b 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -414,7 +414,6 @@ var EditSession = function(text, mode) {
             var lines = this.doc.getAllLines();
             var longestLine = 0;
             var longestScreenLine = 0;
-            var tabSize = this.getTabSize();
 
             for ( var i = 0; i < lines.length; i++) {
                 var line = lines[i],
@@ -440,14 +439,6 @@ var EditSession = function(text, mode) {
         return this.doc.getLine(row);
     };
 
-    /**
-     * Get a line as it is displayed on screen. Tabs are replaced by spaces.
-     */
-    this.getDisplayLine = function(row) {
-        var tab = new Array(this.getTabSize()+1).join(" ");
-        return this.doc.getLine(row).replace(/\t/g, tab);
-    };
-
     this.getLines = function(firstRow, lastRow) {
         return this.doc.getLines(firstRow, lastRow);
     };
@@ -947,20 +938,20 @@ var EditSession = function(text, mode) {
         var tabSize;
 
         for (var i = 0; i < str.length; i++) {
-			var c = str.charCodeAt(i);
-			// Tab
-			if (c == 9) {
+            var c = str.charCodeAt(i);
+            // Tab
+            if (c == 9) {
                 tabSize = this.getScreenTabSize(arr.length);
-			    arr.push(TAB);
-			    for (var n = 1; n < tabSize; n++) {
-			        arr.push(TAB_SPACE);
-			    }
-			}
-			// Space
-			else if(c == 32) {
-			    arr.push(SPACE);
-			}
-    		// CJK characters
+                arr.push(TAB);
+                for (var n = 1; n < tabSize; n++) {
+                    arr.push(TAB_SPACE);
+                }
+            }
+            // Space
+            else if(c == 32) {
+                arr.push(SPACE);
+            }
+            // CJK characters
             else if (
                 c >= 0x3040 && c <= 0x309F || // Hiragana
                 c >= 0x30A0 && c <= 0x30FF || // Katakana
@@ -987,13 +978,13 @@ var EditSession = function(text, mode) {
         var screenColumn = 0;
         var tabSize = this.getTabSize();
 
-		for (var i=0; i<str.length; i++) {
-			var c = str.charCodeAt(i);
-			// tab
-			if (c == 9) {
-				screenColumn += this.getScreenTabSize(screenColumn);
-			}
-    		// CJK characters
+        for (var i=0; i<str.length; i++) {
+            var c = str.charCodeAt(i);
+            // tab
+            if (c == 9) {
+                screenColumn += this.getScreenTabSize(screenColumn);
+            }
+            // CJK characters
             else if (
                 c >= 0x3040 && c <= 0x309F || // Hiragana
                 c >= 0x30A0 && c <= 0x30FF || // Katakana
@@ -1001,13 +992,13 @@ var EditSession = function(text, mode) {
                 c >= 0xF900 && c <= 0xFAFF ||
                 c >= 0x3400 && c <= 0x4DBF
             ) {
-            	screenColumn += 2;
-			} else {
-				screenColumn += 1;
-			}
-		}
+                screenColumn += 2;
+            } else {
+                screenColumn += 1;
+            }
+        }
 
-		return screenColumn;
+        return screenColumn;
     }
 
     this.getRowHeight = function(config, row) {
@@ -1125,15 +1116,15 @@ var EditSession = function(text, mode) {
         } else {
             var wrapData = this.$wrapData;
 
-			var docRow = 0;
-			while (docRow < linesCount && row >= wrapData[docRow].length + 1) {
-				row -= wrapData[docRow].length + 1;
-				docRow ++;
-			}
+            var docRow = 0;
+            while (docRow < linesCount && row >= wrapData[docRow].length + 1) {
+                row -= wrapData[docRow].length + 1;
+                docRow ++;
+            }
 
             if (docRow >= linesCount) {
                 docRow = linesCount-1
-				row = wrapData[docRow].length;
+                row = wrapData[docRow].length;
             }
             docColumn = wrapData[docRow][row - 1] || 0;
             line = this.getLine(docRow).substring(docColumn);
@@ -1184,7 +1175,7 @@ var EditSession = function(text, mode) {
         // Clamp docColumn.
         if (this.$useWrapMode) {
             column = wrapData[docRow][row]
-			if (docColumn >= column) {
+            if (docColumn >= column) {
                 // We remove one character at the end such that the docColumn
                 // position returned is not associated to the next row on the
                 // screen.

From 8f33d91fc4b21b7121eb28dfd4eb22765f6aaeaf Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Mon, 21 Mar 2011 09:43:31 +0000
Subject: [PATCH 07/26] resolve keybinding collision between goto line and
 center selection on windows

---
 lib/ace/commands/default_commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index 979f6842..9b300747 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -351,7 +351,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "centerselection",
-    bindKey: bindKey("Ctrl-L", "Ctrl-L"),
+    bindKey: bindKey(null, "Ctrl-L"),
     exec: function(env, args, request) { env.editor.centerSelection(); }
 });
 canon.addCommand({

From 2adae3bd72c67343cdd25bced5c53977c6e57eba Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Mon, 21 Mar 2011 17:43:31 +0800
Subject: [PATCH 08/26] resolve keybinding collision between goto line and
 center selection on windows

---
 lib/ace/commands/default_commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index 979f6842..9b300747 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -351,7 +351,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "centerselection",
-    bindKey: bindKey("Ctrl-L", "Ctrl-L"),
+    bindKey: bindKey(null, "Ctrl-L"),
     exec: function(env, args, request) { env.editor.centerSelection(); }
 });
 canon.addCommand({

From e09e67b940b5d9599d505a2164c4f784215ba865 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 05:25:39 +0800
Subject: [PATCH 09/26] Use getStringScreenWidth in Session.computeWidth

---
 lib/ace/edit_session.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 6c33c449..6ccb6a91 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -348,16 +348,16 @@ var EditSession = function(text, mode) {
     this.setUseWorker = function(useWorker) {
         if (this.$useWorker == useWorker)
             return;
-            
+
         if (useWorker && !this.$worker && window.Worker)
             this.$worker = mode.createWorker(this);
-            
+
         if (!useWorker && this.$worker) {
             this.$worker.terminate();
             this.$worker = null;
         }
     };
-    
+
     this.getUseWorker = function() {
         return this.$useWorker;
     };
@@ -417,14 +417,11 @@ var EditSession = function(text, mode) {
             var tabSize = this.getTabSize();
 
             for ( var i = 0; i < lines.length; i++) {
-                var len = lines[i].length;
+                var line = lines[i],
+                    len = line.length,
+                    screenLen = this.$getStringScreenWidth(line);
                 longestLine = Math.max(longestLine, len);
-
-                lines[i].replace(/\t/g, function(m) {
-                    len += tabSize-1;
-                    return m;
-                });
-                longestScreenLine = Math.max(longestScreenLine, len);
+                longestScreenLine = Math.max(longestScreenLine, screenLen);
             }
             this.width = longestLine;
 
@@ -601,7 +598,7 @@ var EditSession = function(text, mode) {
 
 
         var actions = [{}];
-        
+
         // collapse insert and remove operations
         for (var i=0; i<deltas.length; i++) {
             var delta = deltas[i];
@@ -615,7 +612,7 @@ var EditSession = function(text, mode) {
                 })
             }
             else {
-                if (isInsert)    
+                if (isInsert)
                     action.end = delta.range.end;
                 else
                     action.start = delta.range.start;
@@ -625,12 +622,12 @@ var EditSession = function(text, mode) {
         // update selection based on last operation
         this.selection.clearSelection();
         var action = actions[actions.length-1];
-        if (action.isInsert) 
+        if (action.isInsert)
             this.selection.setSelectionRange(Range.fromPoints(action.start, action.end));
-        else 
+        else
             this.selection.moveCursorToPosition(action.end);
     },
-    
+
     this.replace = function(range, text) {
         return this.doc.replace(range, text);
     };
@@ -988,7 +985,7 @@ var EditSession = function(text, mode) {
     this.$getStringScreenWidth = function(str) {
         var screenColumn = 0;
         var tabSize = this.getTabSize();
-		
+
 		for (var i=0; i<str.length; i++) {
 			var c = str.charCodeAt(i);
 			// tab
@@ -1008,7 +1005,7 @@ var EditSession = function(text, mode) {
 				screenColumn += 1;
 			}
 		}
-		
+
 		return screenColumn;
     }
 

From b05ec94154a348aa9fc3213a798797493fea79b3 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 06:30:25 +0800
Subject: [PATCH 10/26] First iteration of implementing real real tabs

---
 lib/ace/edit_session.js | 19 +++++++++++--
 lib/ace/layer/text.js   | 63 ++++++++++++++++++++++++++++++-----------
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 6ccb6a91..ed84f009 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -944,13 +944,14 @@ var EditSession = function(text, mode) {
 
     this.$getDisplayTokens = function(str) {
         var arr = [];
-        var tabSize = this.getTabSize();
+        var tabSize;
 
         for (var i = 0; i < str.length; i++) {
 			var c = str.charCodeAt(i);
 			// Tab
 			if (c == 9) {
 			    arr.push(TAB);
+                tabSize = this.getScreenTabSize(arr.length);
 			    for (var n = 1; n < tabSize; n++) {
 			        arr.push(TAB_SPACE);
 			    }
@@ -990,7 +991,7 @@ var EditSession = function(text, mode) {
 			var c = str.charCodeAt(i);
 			// tab
 			if (c == 9) {
-				screenColumn += tabSize;
+				screenColumn += this.getScreenTabSize(screenColumn);
 			}
     		// CJK characters
             else if (
@@ -1103,6 +1104,13 @@ var EditSession = function(text, mode) {
         return this.screenToDocumentPosition(screenRow, screenColumn).column;
     };
 
+    /**
+     * Returns the width of a tab character at screenColumn.
+     */
+    this.getScreenTabSize = function(screenColumn) {
+        return this.$tabSize - screenColumn % this.$tabSize;
+    };
+
     this.screenToDocumentPosition = function(row, column) {
         var line;
         var docRow;
@@ -1131,7 +1139,8 @@ var EditSession = function(text, mode) {
             line = this.getLine(docRow).substring(docColumn);
         }
 
-        var tabSize = this.getTabSize();
+        var tabSize,
+            screenColumn = 0;
         for(var i = 0; i < line.length; i++) {
             var c = line.charCodeAt(i);
 
@@ -1139,8 +1148,10 @@ var EditSession = function(text, mode) {
                 docColumn += 1;
                 // tab
                 if (c == 9) {
+                    tabSize = this.getScreenTabSize(screenColumn);
                     if (remaining >= tabSize) {
                         remaining -= tabSize;
+                        screenColumn += tabSize;
                     } else {
                         remaining = 0;
                         docColumn -= 1;
@@ -1154,6 +1165,7 @@ var EditSession = function(text, mode) {
                     c >= 0xF900 && c <= 0xFAFF ||
                     c >= 0x3400 && c <= 0x4DBF
                 ) {
+                    screenColumn += 2;
                     if (remaining >= 2) {
                         remaining -= 2;
                     } else {
@@ -1161,6 +1173,7 @@ var EditSession = function(text, mode) {
                         docColumn -= 1;
                     }
                 } else {
+                    screenColumn += 2;
                     remaining -= 1;
                 }
             } else {
diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 43f24baa..7c22548f 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -160,18 +160,21 @@ var Text = function(parentEl) {
         return true;
     };
 
+    this.$tabStrings = [];
     this.$computeTabString = function() {
         var tabSize = this.session.getTabSize();
-        if (this.showInvisibles) {
-            var halfTab = (tabSize) / 2;
-            this.$tabString = "<span class='ace_invisible'>"
-                + new Array(Math.floor(halfTab)).join("&#160;")
-                + this.TAB_CHAR
-                + new Array(Math.ceil(halfTab)+1).join("&#160;")
-                + "</span>";
-        } else {
-            this.$tabString = new Array(tabSize+1).join("&#160;");
+        var tabStr = this.$tabStrings = [0];
+        for (var i = 1; i < tabSize + 1; i++) {
+            if (this.showInvisibles) {
+                tabStr.push("<span class='ace_invisible'>"
+                    + this.TAB_CHAR
+                    + new Array(i).join("&#160;")
+                    + "</span>");
+            } else {
+                tabStr.push(new Array(i+1).join("&#160;"));
+            }
         }
+
     };
 
     this.updateLines = function(config, firstRow, lastRow) {
@@ -295,17 +298,41 @@ var Text = function(parentEl) {
             var spaceReplace = "&#160;";
         }
 
-        var _self = this;
-        var characterWidth = this.config.characterWidth;
+        var _self = this,
+            characterWidth = this.config.characterWidth,
+            screenColumn = 0;
+
         function addToken(token, value) {
             var output = value
-                .replace(/&/g, "&amp;")
-                .replace(/</g, "&lt;")
+                    .replace(/\t|&|<|[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c, idx) {
+                        if (c == "\t") {
+                            var tabSize = _self.session.
+                                    getScreenTabSize(screenColumn + idx);
+                            screenColumn += tabSize - 1;
+                            return _self.$tabStrings[tabSize];
+                        } else if (c == "&") {
+                            return "&amp";
+                        } else if (c == "<") {
+                            return "&lt;";
+                        } else {
+                            screenColumn += 1;
+                            return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
+                        }
+                    })
+//                .replace(/\t/g, function(c, idx) {
+//                    idx += screenColumnOld;
+//                    var tabSize = _self.session.getScreenTabSize(idx);
+//                    screenColumn += tabSize - 1;
+//                    return _self.$tabStrings[tabSize];
+//                })
+//                .replace(/&/g, "&amp;")
+//                .replace(/</g, "&lt;")
                 .replace(spaceRe, spaceReplace)
-                .replace(/\t/g, _self.$tabString)
-                .replace(/[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c) {
-                    return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
-                });
+//                .replace(/[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c) {
+//                    screenColumn += 1;
+//                    return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
+//                });
+                screenColumn += value.length;
 
             if (!_self.$textToken[token.type]) {
                 var classes = "ace_" + token.type.replace(/\./g, " ace_");
@@ -344,7 +371,9 @@ var Text = function(parentEl) {
                         "<div style='height:",
                         this.config.lineHeight, "px",
                         "'>");
+
                     split ++;
+                    screenColumn = 0;
                     splitChars = splits[split] || Number.MAX_VALUE;
                 }
                 if (value.length != 0) {

From e8333c2df2895b449db20bc6282f05171a2d6c5a Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 07:34:35 +0800
Subject: [PATCH 11/26] Fixed some bugs and unit tests pass again

---
 lib/ace/edit_session.js           | 10 ++++----
 lib/ace/selection.js              | 33 +++++++++++----------------
 lib/ace/test/edit_session_test.js | 38 +++++++++++++++++++------------
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index ed84f009..536d9784 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -896,9 +896,9 @@ var EditSession = function(text, mode) {
             // and multipleWidth characters.
             var len = displayed.length;
             displayed.join("").
-                // Get all the tabs.
-                replace(/4/g, function(m) {
-                    len -= tabSize - 1;
+                // Get all the tabs spaces.
+                replace(/5/g, function(m) {
+                    len -= 1;
                 }).
                 // Get all the multipleWidth characters.
                 replace(/2/g, function(m) {
@@ -950,8 +950,8 @@ var EditSession = function(text, mode) {
 			var c = str.charCodeAt(i);
 			// Tab
 			if (c == 9) {
-			    arr.push(TAB);
                 tabSize = this.getScreenTabSize(arr.length);
+			    arr.push(TAB);
 			    for (var n = 1; n < tabSize; n++) {
 			        arr.push(TAB_SPACE);
 			    }
@@ -1173,7 +1173,7 @@ var EditSession = function(text, mode) {
                         docColumn -= 1;
                     }
                 } else {
-                    screenColumn += 2;
+                    screenColumn += 1;
                     remaining -= 1;
                 }
             } else {
diff --git a/lib/ace/selection.js b/lib/ace/selection.js
index 5c2a45bb..1be40c41 100644
--- a/lib/ace/selection.js
+++ b/lib/ace/selection.js
@@ -50,7 +50,7 @@ var Selection = function(session) {
     this.clearSelection();
     this.selectionLead = this.doc.createAnchor(0, 0);
     this.selectionAnchor = this.doc.createAnchor(0, 0);
-    
+
     var _self = this;
     this.selectionLead.on("change", function(e) {
         _self._dispatchEvent("changeCursor");
@@ -59,7 +59,7 @@ var Selection = function(session) {
         if (e.old.row == e.value.row)
             _self.$updateDesiredColumn();
     });
-    
+
     this.selectionAnchor.on("change", function() {
         if (!_self.$isEmpty)
             _self._dispatchEvent("changeSelection");
@@ -382,19 +382,14 @@ var Selection = function(session) {
     };
 
     this.moveCursorBy = function(rows, chars) {
-        if (this.session.getUseWrapMode()) {
-            var screenPos = this.session.documentToScreenPosition(
-                this.selectionLead.row, 
-                this.selectionLead.column
-            );
-            var screenCol = (chars == 0 && this.$desiredColumn) || screenPos.column;
-            var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
-            
-            this.moveCursorTo(docPos.row, docPos.column + chars, chars == 0);
-        } else {
-            var docColumn = (chars == 0 && this.$desiredColumn) || this.selectionLead.column;
-            this.moveCursorTo(this.selectionLead.row + rows, docColumn + chars, chars == 0);
-        }
+        var screenPos = this.session.documentToScreenPosition(
+            this.selectionLead.row,
+            this.selectionLead.column
+        );
+        var screenCol = (chars == 0 && this.$desiredColumn) || screenPos.column;
+        var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenCol);
+
+        this.moveCursorTo(docPos.row, docPos.column + chars, chars == 0);
     };
 
     this.moveCursorToPosition = function(position) {
@@ -408,11 +403,9 @@ var Selection = function(session) {
     };
 
     this.moveCursorToScreen = function(row, column, preventUpdateDesiredColumn) {
-        if (this.session.getUseWrapMode()) {
-            var pos = this.session.screenToDocumentPosition(row, column);
-            row = pos.row;
-            column = pos.column;
-        }
+        var pos = this.session.screenToDocumentPosition(row, column);
+        row = pos.row;
+        column = pos.column;
         this.moveCursorTo(row, column, preventUpdateDesiredColumn);
     };
 
diff --git a/lib/ace/test/edit_session_test.js b/lib/ace/test/edit_session_test.js
index 3cb061bb..0e6f4663 100644
--- a/lib/ace/test/edit_session_test.js
+++ b/lib/ace/test/edit_session_test.js
@@ -140,18 +140,19 @@ var Test = {
         assert.equal(session.documentToScreenColumn(0, 0), 0);
         assert.equal(session.documentToScreenColumn(0, 4), 4);
         assert.equal(session.documentToScreenColumn(0, 5), 5);
-        assert.equal(session.documentToScreenColumn(0, 6), 9);
-        assert.equal(session.documentToScreenColumn(0, 12), 15);
-        assert.equal(session.documentToScreenColumn(0, 13), 19);
+        assert.equal(session.documentToScreenColumn(0, 6), 8);
+        assert.equal(session.documentToScreenColumn(0, 12), 14);
+        assert.equal(session.documentToScreenColumn(0, 13), 16);
 
         session.setTabSize(2);
 
         assert.equal(session.documentToScreenColumn(0, 0), 0);
         assert.equal(session.documentToScreenColumn(0, 4), 4);
         assert.equal(session.documentToScreenColumn(0, 5), 5);
-        assert.equal(session.documentToScreenColumn(0, 6), 7);
-        assert.equal(session.documentToScreenColumn(0, 12), 13);
-        assert.equal(session.documentToScreenColumn(0, 13), 15);
+        assert.equal(session.documentToScreenColumn(0, 6), 6);
+        assert.equal(session.documentToScreenColumn(0, 7), 7);
+        assert.equal(session.documentToScreenColumn(0, 12), 12);
+        assert.equal(session.documentToScreenColumn(0, 13), 14);
     },
 
     "test: convert document to screen coordinates with leading tabs": function() {
@@ -179,7 +180,7 @@ var Test = {
         session.setUseWrapMode(true);
         session.setWrapLimitRange(2, 2);
         session.adjustWrapLimit(80);
-        
+
         assert.position(session.documentToScreenPosition(0, 1), 1, 0);
         assert.position(session.documentToScreenPosition(0, 2), 2, 0);
         assert.position(session.documentToScreenPosition(0, 4), 2, 1);
@@ -194,10 +195,20 @@ var Test = {
         assert.equal(session.screenToDocumentColumn(0, 5), 5);
         assert.equal(session.screenToDocumentColumn(0, 6), 5);
         assert.equal(session.screenToDocumentColumn(0, 7), 5);
-        assert.equal(session.screenToDocumentColumn(0, 8), 5);
-        assert.equal(session.screenToDocumentColumn(0, 9), 6);
+        assert.equal(session.screenToDocumentColumn(0, 8), 6);
+        assert.equal(session.screenToDocumentColumn(0, 9), 7);
         assert.equal(session.screenToDocumentColumn(0, 15), 12);
-        assert.equal(session.screenToDocumentColumn(0, 19), 13);
+        assert.equal(session.screenToDocumentColumn(0, 19), 16);
+
+        session.setTabSize(2);
+
+        assert.equal(session.screenToDocumentColumn(0, 0), 0);
+        assert.equal(session.screenToDocumentColumn(0, 4), 4);
+        assert.equal(session.screenToDocumentColumn(0, 5), 5);
+        assert.equal(session.screenToDocumentColumn(0, 6), 6);
+        assert.equal(session.screenToDocumentColumn(0, 12), 12);
+        assert.equal(session.screenToDocumentColumn(0, 13), 12);
+        assert.equal(session.screenToDocumentColumn(0, 14), 13);
     },
 
     "test: screenToDocument with soft wrap and multi byte characters": function() {
@@ -217,7 +228,7 @@ var Test = {
         session = new EditSession(["ぁ a"]);
         session.setUseWrapMode(true);
         session.adjustWrapLimit(80);
-        
+
         assert.position(session.screenToDocumentPosition(0, 1), 0, 0);
         assert.position(session.screenToDocumentPosition(0, 2), 0, 1);
         assert.position(session.screenToDocumentPosition(0, 3), 0, 2);
@@ -227,13 +238,12 @@ var Test = {
 
     "test: wrapLine split function" : function() {
         var splits;
-        var computeWrapSplits = EditSession.prototype.$computeWrapSplits;
         var c = 0;
 
         function computeAndAssert(line, assertEqual, wrapLimit, tabSize) {
             wrapLimit = wrapLimit || 12;
             tabSize = tabSize || 4;
-            splits = computeWrapSplits.call(EditSession.prototype, line, wrapLimit, tabSize);
+            var splits = EditSession.prototype.$computeWrapSplits(line, wrapLimit, tabSize);
             // console.log("String:", line, "Result:", splits, "Expected:", assertEqual);
             assert.ok(splits.length == assertEqual.length);
             for (var i = 0; i < splits.length; i++) {
@@ -297,7 +307,7 @@ var Test = {
 
         assert.equal(session.$getDisplayTokens("\t").length, 4);
         assert.equal(session.$getDisplayTokens("abc").length, 3);
-        assert.equal(session.$getDisplayTokens("abc\t").length, 7);
+        assert.equal(session.$getDisplayTokens("abc\t").length, 4);
     },
 
     "test issue 83": function() {

From 468ba768909083d20b8c6b52a835ec92f5e3a654 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 07:54:35 +0800
Subject: [PATCH 12/26] Moving replacing of spaces into big replace function to
 avoid replacements of <span ...>tab</span>

---
 lib/ace/layer/text.js | 48 ++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 7c22548f..7d4f845b 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -280,58 +280,36 @@ var Text = function(parentEl) {
     };
 
     this.$renderLine = function(stringBuilder, row, tokens) {
-        if (this.showInvisibles) {
-            var self = this;
-            var spaceRe = /( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])/g;
-            var spaceReplace = function(space) {
-                if (space.charCodeAt(0) == 32)
-                    return new Array(space.length+1).join("&#160;");
-                else {
-                    var space = new Array(space.length+1).join(self.SPACE_CHAR);
-                    return "<span class='ace_invisible'>" + space + "</span>";
-                }
-
-            };
-        }
-        else {
-            var spaceRe = /[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/g;
-            var spaceReplace = "&#160;";
-        }
-
         var _self = this,
             characterWidth = this.config.characterWidth,
             screenColumn = 0;
 
         function addToken(token, value) {
             var output = value
-                    .replace(/\t|&|<|[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c, idx) {
-                        if (c == "\t") {
+                    .replace(/\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c, a, b, tabIdx, idx4) {
+                        if (c.charCodeAt(0) == 32) {
+                            return new Array(c.length+1).join("&#160;");
+                        } else if (c == "\t") {
                             var tabSize = _self.session.
-                                    getScreenTabSize(screenColumn + idx);
+                                    getScreenTabSize(screenColumn + tabIdx);
                             screenColumn += tabSize - 1;
                             return _self.$tabStrings[tabSize];
                         } else if (c == "&") {
                             return "&amp";
                         } else if (c == "<") {
                             return "&lt;";
+                        } else if (c.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)) {
+                            if (this.showInvisibles) {
+                                var space = new Array(c.length+1).join(self.SPACE_CHAR);
+                                return "<span class='ace_invisible'>" + space + "</span>";
+                            } else {
+                                return "&#160;"
+                            }
                         } else {
                             screenColumn += 1;
                             return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
                         }
-                    })
-//                .replace(/\t/g, function(c, idx) {
-//                    idx += screenColumnOld;
-//                    var tabSize = _self.session.getScreenTabSize(idx);
-//                    screenColumn += tabSize - 1;
-//                    return _self.$tabStrings[tabSize];
-//                })
-//                .replace(/&/g, "&amp;")
-//                .replace(/</g, "&lt;")
-                .replace(spaceRe, spaceReplace)
-//                .replace(/[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c) {
-//                    screenColumn += 1;
-//                    return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
-//                });
+                    });
                 screenColumn += value.length;
 
             if (!_self.$textToken[token.type]) {

From 0f4e2016c7eaa9c9350258a601f0caa406a580ca Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 21:14:06 +0800
Subject: [PATCH 13/26] Add 'softTab' option to demo

---
 demo/demo.js | 20 ++++++++++++--------
 index.html   | 28 ++++++++++++++++------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/demo/demo.js b/demo/demo.js
index b2bc257a..2655a4c1 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -139,7 +139,7 @@ exports.launch = function(env) {
     docs.svg = new EditSession(document.getElementById("svgtext").innerHTML.replace("&lt;", "<"));
     docs.svg.setMode(new SvgMode());
     docs.svg.setUndoManager(new UndoManager());
-    
+
     docs.textile = new EditSession(document.getElementById("textiletext").innerHTML);
     docs.textile.setMode(new TextileMode());
     docs.textile.setUndoManager(new UndoManager());
@@ -301,6 +301,10 @@ exports.launch = function(env) {
         env.editor.renderer.setHScrollBarAlwaysVisible(checked);
     });
 
+    bindCheckbox("soft_tab", function(checked) {
+        env.editor.getSession().setUseSoftTabs(checked);
+    });
+
     function bindCheckbox(id, callback) {
         var el = document.getElementById(id);
         var onCheck = function() {
@@ -383,11 +387,11 @@ exports.launch = function(env) {
     });
 
     window.env = env;
-    
+
     /**
      * This demonstrates how you can define commands and bind shortcuts to them.
      */
-    
+
     // Command to focus the command line from the editor.
     canon.addCommand({
         name: "focuscli",
@@ -400,7 +404,7 @@ exports.launch = function(env) {
             env.cli.cliView.element.focus();
         }
     });
-    
+
     // Command to focus the editor line from the command line.
     canon.addCommand({
         name: "focuseditor",
@@ -413,7 +417,7 @@ exports.launch = function(env) {
             env.editor.focus();
         }
     });
-    
+
     // Fake-Save, works from the editor and the command line.
     canon.addCommand({
         name: "save",
@@ -426,7 +430,7 @@ exports.launch = function(env) {
             alert("Fake Save File");
         }
     });
-    
+
     // Fake-Print with custom lookup-sender-match function.
     canon.addCommand({
         name: "save",
@@ -435,9 +439,9 @@ exports.launch = function(env) {
             mac: "Command-P",
             sender: function(env, sender, hashId, keyString) {
                 if (sender == "editor") {
-                    return true;   
+                    return true;
                 } else {
-                    alert("Sorry, can only print from the editor");                    
+                    alert("Sorry, can only print from the editor");
                 }
             }
         },
diff --git a/index.html b/index.html
index 60703dd5..4cdac4cd 100644
--- a/index.html
+++ b/index.html
@@ -71,7 +71,7 @@
       </td>
       <td align="right">
         <label for="show_hidden">Show Invisibles</label>
-        <input type="checkbox" name="show_hidden" id="show_hidden">
+        <input type="checkbox" name="show_hidden" id="show_hidden" checked>
       </td>
       <td align="right">
         <label for="show_hscroll">Persistent HScroll</label>
@@ -128,6 +128,10 @@
         <label for="show_print_margin">Show Print Margin</label>
         <input type="checkbox" id="show_print_margin" checked>
       </td>
+      <td align="right">
+        <label for="soft_tab">Use Soft Tab:</label>
+        <input type="checkbox" id="soft_tab" checked>
+      </td>
       <td align="right">
         <label for="highlight_selected_word">Highlight selected word</label>
         <input type="checkbox" id="highlight_selected_word" checked>
@@ -144,7 +148,7 @@
     <script type="text/editor" id="jstext">function foo(items) {
     for (var i=0; i<items.length; i++) {
         alert(items[i] + "juhu");
-    }
+    }	// Real Tab.
 }
 // A magic character: >> ぁ <<
 </script>
@@ -329,8 +333,8 @@ print "\n";
 
 </script>
 
-<script type="text/editor" id="svgtext"><svg 
-  width="800" height="600" 
+<script type="text/editor" id="svgtext"><svg
+  width="800" height="600"
   xmlns="http://www.w3.org/2000/svg"
   onload="StartAnimation(evt)">
 
@@ -380,14 +384,14 @@ print "\n";
     window.ShowAndGrowElement = ShowAndGrowElement
   ]]>&lt;/script>
 
-  <rect 
-    fill="#2e3436" 
-    fill-rule="nonzero" 
-    stroke-width="3" 
-    y="0" 
-    x="0" 
-    height="600" 
-    width="800" 
+  <rect
+    fill="#2e3436"
+    fill-rule="nonzero"
+    stroke-width="3"
+    y="0"
+    x="0"
+    height="600"
+    width="800"
     id="rect3590"/>
 
     <text

From 8d8ac9ead67725f7aff9cbcb7217d1f127345915 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 19 Mar 2011 21:26:14 +0800
Subject: [PATCH 14/26] Remove not used getDisplayLine() function and convert
 tabs to spaces

---
 lib/ace/edit_session.js | 75 ++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 42 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 536d9784..6627130b 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -414,7 +414,6 @@ var EditSession = function(text, mode) {
             var lines = this.doc.getAllLines();
             var longestLine = 0;
             var longestScreenLine = 0;
-            var tabSize = this.getTabSize();
 
             for ( var i = 0; i < lines.length; i++) {
                 var line = lines[i],
@@ -440,14 +439,6 @@ var EditSession = function(text, mode) {
         return this.doc.getLine(row);
     };
 
-    /**
-     * Get a line as it is displayed on screen. Tabs are replaced by spaces.
-     */
-    this.getDisplayLine = function(row) {
-        var tab = new Array(this.getTabSize()+1).join(" ");
-        return this.doc.getLine(row).replace(/\t/g, tab);
-    };
-
     this.getLines = function(firstRow, lastRow) {
         return this.doc.getLines(firstRow, lastRow);
     };
@@ -947,20 +938,20 @@ var EditSession = function(text, mode) {
         var tabSize;
 
         for (var i = 0; i < str.length; i++) {
-			var c = str.charCodeAt(i);
-			// Tab
-			if (c == 9) {
+            var c = str.charCodeAt(i);
+            // Tab
+            if (c == 9) {
                 tabSize = this.getScreenTabSize(arr.length);
-			    arr.push(TAB);
-			    for (var n = 1; n < tabSize; n++) {
-			        arr.push(TAB_SPACE);
-			    }
-			}
-			// Space
-			else if(c == 32) {
-			    arr.push(SPACE);
-			}
-    		// CJK characters
+                arr.push(TAB);
+                for (var n = 1; n < tabSize; n++) {
+                    arr.push(TAB_SPACE);
+                }
+            }
+            // Space
+            else if(c == 32) {
+                arr.push(SPACE);
+            }
+            // CJK characters
             else if (
                 c >= 0x3040 && c <= 0x309F || // Hiragana
                 c >= 0x30A0 && c <= 0x30FF || // Katakana
@@ -987,13 +978,13 @@ var EditSession = function(text, mode) {
         var screenColumn = 0;
         var tabSize = this.getTabSize();
 
-		for (var i=0; i<str.length; i++) {
-			var c = str.charCodeAt(i);
-			// tab
-			if (c == 9) {
-				screenColumn += this.getScreenTabSize(screenColumn);
-			}
-    		// CJK characters
+        for (var i=0; i<str.length; i++) {
+            var c = str.charCodeAt(i);
+            // tab
+            if (c == 9) {
+                screenColumn += this.getScreenTabSize(screenColumn);
+            }
+            // CJK characters
             else if (
                 c >= 0x3040 && c <= 0x309F || // Hiragana
                 c >= 0x30A0 && c <= 0x30FF || // Katakana
@@ -1001,13 +992,13 @@ var EditSession = function(text, mode) {
                 c >= 0xF900 && c <= 0xFAFF ||
                 c >= 0x3400 && c <= 0x4DBF
             ) {
-            	screenColumn += 2;
-			} else {
-				screenColumn += 1;
-			}
-		}
+                screenColumn += 2;
+            } else {
+                screenColumn += 1;
+            }
+        }
 
-		return screenColumn;
+        return screenColumn;
     }
 
     this.getRowHeight = function(config, row) {
@@ -1125,15 +1116,15 @@ var EditSession = function(text, mode) {
         } else {
             var wrapData = this.$wrapData;
 
-			var docRow = 0;
-			while (docRow < linesCount && row >= wrapData[docRow].length + 1) {
-				row -= wrapData[docRow].length + 1;
-				docRow ++;
-			}
+            var docRow = 0;
+            while (docRow < linesCount && row >= wrapData[docRow].length + 1) {
+                row -= wrapData[docRow].length + 1;
+                docRow ++;
+            }
 
             if (docRow >= linesCount) {
                 docRow = linesCount-1
-				row = wrapData[docRow].length;
+                row = wrapData[docRow].length;
             }
             docColumn = wrapData[docRow][row - 1] || 0;
             line = this.getLine(docRow).substring(docColumn);
@@ -1184,7 +1175,7 @@ var EditSession = function(text, mode) {
         // Clamp docColumn.
         if (this.$useWrapMode) {
             column = wrapData[docRow][row]
-			if (docColumn >= column) {
+            if (docColumn >= column) {
                 // We remove one character at the end such that the docColumn
                 // position returned is not associated to the next row on the
                 // screen.

From ae8e262395a8312137fc8a25a1b2ebf46d376453 Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Wed, 16 Mar 2011 05:04:02 +0800
Subject: [PATCH 15/26] add ruby symbol and erb

---
 lib/ace/mode/html_highlight_rules.js | 31 ++++++++++++++++++++++++++++
 lib/ace/mode/ruby_highlight_rules.js |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index 26ab064e..b47266c9 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -40,6 +40,7 @@ define(function(require, exports, module) {
 var oop = require("pilot/oop");
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
 var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
+var RubyHighlightRules = require("ace/mode/ruby_highlight_rules").RubyHighlightRules;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var HtmlHighlightRules = function() {
@@ -67,6 +68,10 @@ var HtmlHighlightRules = function() {
             token : "text",
             regex : "<(?=\s*style)",
             next : "css"
+        }, {
+            token : "text",
+            regex : "<(?=\s*%)",
+            next : "ruby"
         }, {
             token : "text", // opening tag
             regex : "<\\/?",
@@ -115,6 +120,24 @@ var HtmlHighlightRules = function() {
             regex : "'.*?'"
         } ],
 
+        ruby : [ {
+            token : "text",
+            regex : ">",
+            next : "ruby-start"
+        }, {
+            token : "keyword",
+            regex : "[-_a-zA-Z0-9:]+"
+        }, {
+            token : "text",
+            regex : "\\s+"
+        }, {
+            token : "string",
+            regex : '".*?"'
+        }, {
+            token : "string",
+            regex : "'.*?'"
+        } ],
+
         tag : [ {
             token : "text",
             regex : ">",
@@ -174,6 +197,14 @@ var HtmlHighlightRules = function() {
         regex: "<\\/(?=style)",
         next: "tag"
     });
+    
+    var rubyRules = new RubyHighlightRules().getRules();
+    this.addRules(rubyRules, "ruby-");
+    this.$rules["ruby-start"].unshift({
+        token: "text",
+        regex: "<\\/(?=%)",
+        next: "tag"
+    });
 };
 
 oop.inherits(HtmlHighlightRules, TextHighlightRules);
diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index c2e4c566..b36e9c84 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -86,6 +86,9 @@ var RubyHighlightRules = function() {
 	        }, {
                 token : "string", // single line
                 regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+	        }, {
+                token: "string", // symbol
+                regex: "[:](?:[a-zA-Z]|\d)+"
 	        }, {
 	            token : "constant.numeric", // hex
 	            regex : "0[xX][0-9a-fA-F]+\\b"

From 71969c2538995697ba45f4eca63b73392c42f431 Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Wed, 16 Mar 2011 05:59:51 +0800
Subject: [PATCH 16/26] add more keywords

---
 lib/ace/mode/ruby_highlight_rules.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index b36e9c84..b28376fa 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -45,8 +45,8 @@ var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightR
 var RubyHighlightRules = function() {
 
     var builtinFunctions = lang.arrayToMap(
-        ("abort|Array|at_exit|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|eval|exec|exit|exit!" +
-        "fail|Float|fork|format|gets|global_variables|gsub|gsub!|Integer|lambda|load|local_variables|loop|open|p|print|" +
+        ("abort|Array|at_exit|attr|attr_writer|attr_reader|attr_accessor|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|eval|exec|exit|exit!" +
+        "fail|Float|fork|format|gem|gets|global_variables|gsub|gsub!|include|Integer|lambda|load|local_variables|loop|open|p|print|" +
         "printf|proc|putc|puts|raise|rand|readline|readlines|require|scan|select|set_trace_func|sleep|split|sprintf|srand|" +
         "String|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|" +
         "atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan").split("|")
@@ -54,7 +54,7 @@ var RubyHighlightRules = function() {
 
     var keywords = lang.arrayToMap(
         ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|" +
-        "if|in|__LINE__|module|next|not|or|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
+        "if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
     );
 
     var buildinConstants = lang.arrayToMap(

From 1abfd5f8134bd94a6c2e2623830ecbd47d36c40c Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Wed, 16 Mar 2011 06:32:10 +0800
Subject: [PATCH 17/26] add some Rails things

---
 lib/ace/mode/ruby_highlight_rules.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index b28376fa..0eedb3eb 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -45,20 +45,32 @@ var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightR
 var RubyHighlightRules = function() {
 
     var builtinFunctions = lang.arrayToMap(
-        ("abort|Array|at_exit|attr|attr_writer|attr_reader|attr_accessor|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|eval|exec|exit|exit!" +
-        "fail|Float|fork|format|gem|gets|global_variables|gsub|gsub!|include|Integer|lambda|load|local_variables|loop|open|p|print|" +
-        "printf|proc|putc|puts|raise|rand|readline|readlines|require|scan|select|set_trace_func|sleep|split|sprintf|srand|" +
-        "String|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|" +
-        "atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan").split("|")
+        ("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|" +
+        "assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|" + 
+        "assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|" +
+        "assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|" +
+        "assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|" +
+        "assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|" +
+        "attr|attr_writer|attr_reader|attr_accessor|autoload|binding|block_given?|callcc|" +
+        "caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|" +
+        "exit!|fail|Float|flunk|follow_redirect!|fork|format|gets|global_variables|gsub|" +
+        "gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|" +
+        "link_to_function|link_to_remote|load|local_variables|loop|open|open_session|" +
+        "p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|" +
+        "raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|" +
+        "set_trace_func|sleep|split|sprintf|srand|String|syscall|system|sub|sub!|test|" +
+        "throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan").split("|")
     );
 
     var keywords = lang.arrayToMap(
-        ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|" +
-        "if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
+        ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
+        "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" + 
+        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
     );
 
     var buildinConstants = lang.arrayToMap(
-        ("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING").split("|")
+        ("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
+        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING").split("|")
     );
 
     var builtinVariables = lang.arrayToMap(

From 0d03b6df7d3be7198e1a6929cad52be05d4f0a07 Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Wed, 16 Mar 2011 06:47:36 +0800
Subject: [PATCH 18/26] add backtick string and instance variable rules

---
 lib/ace/mode/ruby_highlight_rules.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index 0eedb3eb..d117d2a6 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -99,8 +99,14 @@ var RubyHighlightRules = function() {
                 token : "string", // single line
                 regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
 	        }, {
-                token: "string", // symbol
-                regex: "[:](?:[a-zA-Z]|\d)+"
+                token : "string", // backtick string
+                regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
+	        }, {
+                token : "variable.instancce", // instance variable
+                regex : "@{1,2}(?:[a-zA-Z]|\d)+"
+	        }, {
+                token : "string", // symbol
+                regex : "[:](?:[a-zA-Z]|\d)+"
 	        }, {
 	            token : "constant.numeric", // hex
 	            regex : "0[xX][0-9a-fA-F]+\\b"

From 20b6652c5b31b87610b2233e75767ba7e54472f7 Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Wed, 16 Mar 2011 06:53:41 +0800
Subject: [PATCH 19/26] add class name rule

---
 lib/ace/mode/ruby_highlight_rules.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index d117d2a6..1bb946d2 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -103,7 +103,10 @@ var RubyHighlightRules = function() {
                 regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 	        }, {
                 token : "variable.instancce", // instance variable
-                regex : "@{1,2}(?:[a-zA-Z]|\d)+"
+                regex : "@{1,2}(?:[a-zA-Z_]|\d)+"
+	        }, {
+                token : "variable.class", // class name
+                regex : "[A-Z](?:[a-zA-Z_]|\d)+"
 	        }, {
                 token : "string", // symbol
                 regex : "[:](?:[a-zA-Z]|\d)+"

From 13bda087e89a5145d68ad93c0511b8d561d2b15b Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Wed, 16 Mar 2011 08:14:47 +0800
Subject: [PATCH 20/26] erb support!

---
 lib/ace/mode/html.js                 | 8 ++++++++
 lib/ace/mode/html_highlight_rules.js | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index 2dced037..31c645e5 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -41,6 +41,7 @@ var oop = require("pilot/oop");
 var TextMode = require("ace/mode/text").Mode;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
 var CssMode = require("ace/mode/css").Mode;
+var RubyMode = require("ace/mode/ruby").Mode;
 var Tokenizer = require("ace/tokenizer").Tokenizer;
 var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
 
@@ -49,6 +50,7 @@ var Mode = function() {
 
     this.$js = new JavaScriptMode();
     this.$css = new CssMode();
+    this.$ruby = new RubyMode();
 };
 oop.inherits(Mode, TextMode);
 
@@ -91,6 +93,12 @@ oop.inherits(Mode, TextMode);
             args[0] = split[1];
             return this.$css[method].apply(this.$css, args);
         }
+        
+        var split = state.split("ruby-");
+        if (!split[0] && split[1]) {
+            args[0] = split[1];
+            return this.$ruby[method].apply(this.$ruby, args);
+        }
 
         return defaultHandler ? defaultHandler() : undefined;
     };
diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index b47266c9..6fe97112 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -122,7 +122,7 @@ var HtmlHighlightRules = function() {
 
         ruby : [ {
             token : "text",
-            regex : ">",
+            regex : ".",
             next : "ruby-start"
         }, {
             token : "keyword",
@@ -202,7 +202,7 @@ var HtmlHighlightRules = function() {
     this.addRules(rubyRules, "ruby-");
     this.$rules["ruby-start"].unshift({
         token: "text",
-        regex: "<\\/(?=%)",
+        regex: "%>",
         next: "tag"
     });
 };

From 723f284a107673283688728f617c1b10daecaa4e Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Wed, 16 Mar 2011 20:39:23 +0800
Subject: [PATCH 21/26] more rails built in functions and variables

---
 lib/ace/mode/ruby_highlight_rules.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index 1bb946d2..9270950d 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -51,15 +51,30 @@ var RubyHighlightRules = function() {
         "assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|" +
         "assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|" +
         "assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|" +
-        "attr|attr_writer|attr_reader|attr_accessor|autoload|binding|block_given?|callcc|" +
+        "attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|" +
         "caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|" +
-        "exit!|fail|Float|flunk|follow_redirect!|fork|format|gets|global_variables|gsub|" +
+        "exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|" +
         "gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|" +
-        "link_to_function|link_to_remote|load|local_variables|loop|open|open_session|" +
+        "link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|" +
         "p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|" +
         "raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|" +
-        "set_trace_func|sleep|split|sprintf|srand|String|syscall|system|sub|sub!|test|" +
-        "throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan").split("|")
+        "set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|" +
+        "throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|" +
+        "render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|" +
+        "content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|" +
+        "fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|" +
+        "time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|" +
+        "select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|" +
+        "file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|" +
+        "protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|" +
+        "send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|" +
+        "validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|" +
+        "validates_inclusion_of|validates_numericality_of|validates_with|validates_each|" +
+        "authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|" +
+        "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
+        "translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|" +
+        "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
+        "has_many|has_one|belongs_to|has_and_belongs_to_many").split("|")
     );
 
     var keywords = lang.arrayToMap(
@@ -74,7 +89,8 @@ var RubyHighlightRules = function() {
     );
 
     var builtinVariables = lang.arrayToMap(
-        ("\$DEBUG|\$defout|\$FILENAME|\$LOAD_PATH|\$SAFE|\$stdin|\$stdout|\$stderr|\$VERBOSE").split("|")
+        ("\$DEBUG|\$defout|\$FILENAME|\$LOAD_PATH|\$SAFE|\$stdin|\$stdout|\$stderr|\$VERBOSE|" +
+        "root_url|flash|session|cookies|params|request|response|logger").split("|")
     );
 
     // regexp must not have capturing parentheses. Use (?:) instead.

From c1c6e2b7277719b46608e6d94e3465c1a0c7450f Mon Sep 17 00:00:00 2001
From: Heigh Tech LLC <heigh-tech@heigh-tech.com>
Date: Thu, 17 Mar 2011 01:14:53 +0800
Subject: [PATCH 22/26] add last exception symbol

---
 lib/ace/mode/ruby_highlight_rules.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index 9270950d..cc2464ef 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -90,7 +90,7 @@ var RubyHighlightRules = function() {
 
     var builtinVariables = lang.arrayToMap(
         ("\$DEBUG|\$defout|\$FILENAME|\$LOAD_PATH|\$SAFE|\$stdin|\$stdout|\$stderr|\$VERBOSE|" +
-        "root_url|flash|session|cookies|params|request|response|logger").split("|")
+        "$!|root_url|flash|session|cookies|params|request|response|logger").split("|")
     );
 
     // regexp must not have capturing parentheses. Use (?:) instead.

From e32370cae8abe3c22e0453e97625eea61b478ee3 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Mon, 21 Mar 2011 10:44:16 +0000
Subject: [PATCH 23/26] dom't merge embedded ruby into the standard html mode

---
 lib/ace/mode/html.js                 |  8 -------
 lib/ace/mode/html_highlight_rules.js | 31 ----------------------------
 2 files changed, 39 deletions(-)

diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index 31c645e5..1cc894d9 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -41,7 +41,6 @@ var oop = require("pilot/oop");
 var TextMode = require("ace/mode/text").Mode;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
 var CssMode = require("ace/mode/css").Mode;
-var RubyMode = require("ace/mode/ruby").Mode;
 var Tokenizer = require("ace/tokenizer").Tokenizer;
 var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
 
@@ -50,7 +49,6 @@ var Mode = function() {
 
     this.$js = new JavaScriptMode();
     this.$css = new CssMode();
-    this.$ruby = new RubyMode();
 };
 oop.inherits(Mode, TextMode);
 
@@ -94,12 +92,6 @@ oop.inherits(Mode, TextMode);
             return this.$css[method].apply(this.$css, args);
         }
         
-        var split = state.split("ruby-");
-        if (!split[0] && split[1]) {
-            args[0] = split[1];
-            return this.$ruby[method].apply(this.$ruby, args);
-        }
-
         return defaultHandler ? defaultHandler() : undefined;
     };
 
diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index 6fe97112..26ab064e 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -40,7 +40,6 @@ define(function(require, exports, module) {
 var oop = require("pilot/oop");
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
 var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
-var RubyHighlightRules = require("ace/mode/ruby_highlight_rules").RubyHighlightRules;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var HtmlHighlightRules = function() {
@@ -68,10 +67,6 @@ var HtmlHighlightRules = function() {
             token : "text",
             regex : "<(?=\s*style)",
             next : "css"
-        }, {
-            token : "text",
-            regex : "<(?=\s*%)",
-            next : "ruby"
         }, {
             token : "text", // opening tag
             regex : "<\\/?",
@@ -120,24 +115,6 @@ var HtmlHighlightRules = function() {
             regex : "'.*?'"
         } ],
 
-        ruby : [ {
-            token : "text",
-            regex : ".",
-            next : "ruby-start"
-        }, {
-            token : "keyword",
-            regex : "[-_a-zA-Z0-9:]+"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "string",
-            regex : '".*?"'
-        }, {
-            token : "string",
-            regex : "'.*?'"
-        } ],
-
         tag : [ {
             token : "text",
             regex : ">",
@@ -197,14 +174,6 @@ var HtmlHighlightRules = function() {
         regex: "<\\/(?=style)",
         next: "tag"
     });
-    
-    var rubyRules = new RubyHighlightRules().getRules();
-    this.addRules(rubyRules, "ruby-");
-    this.$rules["ruby-start"].unshift({
-        token: "text",
-        regex: "%>",
-        next: "tag"
-    });
 };
 
 oop.inherits(HtmlHighlightRules, TextHighlightRules);

From ff7559e38860c06330128db9f35ba86bd558aa9b Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Mon, 21 Mar 2011 18:44:16 +0800
Subject: [PATCH 24/26] dom't merge embedded ruby into the standard html mode

---
 lib/ace/mode/html.js                 |  8 -------
 lib/ace/mode/html_highlight_rules.js | 31 ----------------------------
 2 files changed, 39 deletions(-)

diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index 31c645e5..1cc894d9 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -41,7 +41,6 @@ var oop = require("pilot/oop");
 var TextMode = require("ace/mode/text").Mode;
 var JavaScriptMode = require("ace/mode/javascript").Mode;
 var CssMode = require("ace/mode/css").Mode;
-var RubyMode = require("ace/mode/ruby").Mode;
 var Tokenizer = require("ace/tokenizer").Tokenizer;
 var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
 
@@ -50,7 +49,6 @@ var Mode = function() {
 
     this.$js = new JavaScriptMode();
     this.$css = new CssMode();
-    this.$ruby = new RubyMode();
 };
 oop.inherits(Mode, TextMode);
 
@@ -94,12 +92,6 @@ oop.inherits(Mode, TextMode);
             return this.$css[method].apply(this.$css, args);
         }
         
-        var split = state.split("ruby-");
-        if (!split[0] && split[1]) {
-            args[0] = split[1];
-            return this.$ruby[method].apply(this.$ruby, args);
-        }
-
         return defaultHandler ? defaultHandler() : undefined;
     };
 
diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index 6fe97112..26ab064e 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -40,7 +40,6 @@ define(function(require, exports, module) {
 var oop = require("pilot/oop");
 var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
 var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
-var RubyHighlightRules = require("ace/mode/ruby_highlight_rules").RubyHighlightRules;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var HtmlHighlightRules = function() {
@@ -68,10 +67,6 @@ var HtmlHighlightRules = function() {
             token : "text",
             regex : "<(?=\s*style)",
             next : "css"
-        }, {
-            token : "text",
-            regex : "<(?=\s*%)",
-            next : "ruby"
         }, {
             token : "text", // opening tag
             regex : "<\\/?",
@@ -120,24 +115,6 @@ var HtmlHighlightRules = function() {
             regex : "'.*?'"
         } ],
 
-        ruby : [ {
-            token : "text",
-            regex : ".",
-            next : "ruby-start"
-        }, {
-            token : "keyword",
-            regex : "[-_a-zA-Z0-9:]+"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "string",
-            regex : '".*?"'
-        }, {
-            token : "string",
-            regex : "'.*?'"
-        } ],
-
         tag : [ {
             token : "text",
             regex : ">",
@@ -197,14 +174,6 @@ var HtmlHighlightRules = function() {
         regex: "<\\/(?=style)",
         next: "tag"
     });
-    
-    var rubyRules = new RubyHighlightRules().getRules();
-    this.addRules(rubyRules, "ruby-");
-    this.$rules["ruby-start"].unshift({
-        token: "text",
-        regex: "%>",
-        next: "tag"
-    });
 };
 
 oop.inherits(HtmlHighlightRules, TextHighlightRules);

From 21a79fea6555b094deb710f76b63afd2e08498b6 Mon Sep 17 00:00:00 2001
From: Joe Cheng <joe@joecheng.com>
Date: Wed, 23 Mar 2011 12:57:00 -0700
Subject: [PATCH 25/26] Respect full width property of all East Asian
 characters

Common Japanese punctuation (comma, period) was being treated as half-width, causing cursor positioning to be off. The new code is comprehensive for code points in the Basic Multilingual Plane.
See https://gist.github.com/883802 for the script I used to generate the code.
---
 lib/ace/edit_session.js | 65 ++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 6c33c449..a296b694 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -962,14 +962,8 @@ var EditSession = function(text, mode) {
 			else if(c == 32) {
 			    arr.push(SPACE);
 			}
-    		// CJK characters
-            else if (
-                c >= 0x3040 && c <= 0x309F || // Hiragana
-                c >= 0x30A0 && c <= 0x30FF || // Katakana
-                c >= 0x4E00 && c <= 0x9FFF || // Single CJK ideographs
-                c >= 0xF900 && c <= 0xFAFF ||
-                c >= 0x3400 && c <= 0x4DBF
-            ) {
+    		// full width characters
+            else if (isFullWidth(c)) {
                 arr.push(CHAR, CHAR_EXT);
             } else {
                 arr.push(CHAR);
@@ -995,14 +989,8 @@ var EditSession = function(text, mode) {
 			if (c == 9) {
 				screenColumn += tabSize;
 			}
-    		// CJK characters
-            else if (
-                c >= 0x3040 && c <= 0x309F || // Hiragana
-                c >= 0x30A0 && c <= 0x30FF || // Katakana
-                c >= 0x4E00 && c <= 0x9FFF || // Single CJK ideographs
-                c >= 0xF900 && c <= 0xFAFF ||
-                c >= 0x3400 && c <= 0x4DBF
-            ) {
+    		// full width characters
+            else if (isFullWidth(c)) {
             	screenColumn += 2;
 			} else {
 				screenColumn += 1;
@@ -1149,14 +1137,8 @@ var EditSession = function(text, mode) {
                         docColumn -= 1;
                     }
                 }
-                // CJK characters
-                else if (
-                    c >= 0x3040 && c <= 0x309F || // Hiragana
-                    c >= 0x30A0 && c <= 0x30FF || // Katakana
-                    c >= 0x4E00 && c <= 0x9FFF || // Single CJK ideographs
-                    c >= 0xF900 && c <= 0xFAFF ||
-                    c >= 0x3400 && c <= 0x4DBF
-                ) {
+                // full width characters
+                else if (isFullWidth(c)) {
                     if (remaining >= 2) {
                         remaining -= 2;
                     } else {
@@ -1292,6 +1274,41 @@ var EditSession = function(text, mode) {
         }
         return screenRows;
     }
+    
+    function isFullWidth(c) {
+        return c >= 0x1100 && c <= 0x115F ||
+               c >= 0x11A3 && c <= 0x11A7 ||
+               c >= 0x11FA && c <= 0x11FF ||
+               c >= 0x2329 && c <= 0x232A ||
+               c >= 0x2E80 && c <= 0x2E99 ||
+               c >= 0x2E9B && c <= 0x2EF3 ||
+               c >= 0x2F00 && c <= 0x2FD5 ||
+               c >= 0x2FF0 && c <= 0x2FFB ||
+               c >= 0x3000 && c <= 0x303E ||
+               c >= 0x3041 && c <= 0x3096 ||
+               c >= 0x3099 && c <= 0x30FF ||
+               c >= 0x3105 && c <= 0x312D ||
+               c >= 0x3131 && c <= 0x318E ||
+               c >= 0x3190 && c <= 0x31BA ||
+               c >= 0x31C0 && c <= 0x31E3 ||
+               c >= 0x31F0 && c <= 0x321E ||
+               c >= 0x3220 && c <= 0x3247 ||
+               c >= 0x3250 && c <= 0x32FE ||
+               c >= 0x3300 && c <= 0x4DBF ||
+               c >= 0x4E00 && c <= 0xA48C ||
+               c >= 0xA490 && c <= 0xA4C6 ||
+               c >= 0xA960 && c <= 0xA97C ||
+               c >= 0xAC00 && c <= 0xD7A3 ||
+               c >= 0xD7B0 && c <= 0xD7C6 ||
+               c >= 0xD7CB && c <= 0xD7FB ||
+               c >= 0xF900 && c <= 0xFAFF ||
+               c >= 0xFE10 && c <= 0xFE19 ||
+               c >= 0xFE30 && c <= 0xFE52 ||
+               c >= 0xFE54 && c <= 0xFE66 ||
+               c >= 0xFE68 && c <= 0xFE6B ||
+               c >= 0xFF01 && c <= 0xFF60 ||
+               c >= 0xFFE0 && c <= 0xFFE6;
+    }
 
 }).call(EditSession.prototype);
 

From 7fa4d37f57bf306f10c2ed3f06eda156c4d54a12 Mon Sep 17 00:00:00 2001
From: Joe Cheng <joe@joecheng.com>
Date: Wed, 23 Mar 2011 13:17:19 -0700
Subject: [PATCH 26/26] All full width characters should be styled with double
 character width

---
 lib/ace/layer/text.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 43f24baa..f6991792 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -303,9 +303,10 @@ var Text = function(parentEl) {
                 .replace(/</g, "&lt;")
                 .replace(spaceRe, spaceReplace)
                 .replace(/\t/g, _self.$tabString)
-                .replace(/[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF]/g, function(c) {
-                    return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
-                });
+                .replace(/[\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, 
+                    function(c) {
+                        return "<span class='ace_cjk' style='width:" + (characterWidth * 2) + "px'>" + c + "</span>"
+                    });
 
             if (!_self.$textToken[token.type]) {
                 var classes = "ace_" + token.type.replace(/\./g, " ace_");