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] 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.