Fixed displaying of tabs in diffs.

Author: zaggino

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 **If you get an error right after updating just close all Brackets instances and start again. We are aware of this problem.**
 
+## 0.14.24 (14/04/2015)
+* Fixed displaying of tabs in diffs.
+
 ## 0.14.23 (10/04/2015)
 * Fixed previous fix for initial commit diff by [Marcel Gerber](https://github.com/MarcelGerber)
 

src/Utils.js

@@ -45,13 +45,18 @@ define(function (require, exports, module) {
     function formatDiff(diff) {
         var DIFF_MAX_LENGTH = 2000;
 
-        var tabSize      = Preferences.getGlobal("tabSize"),
+        var tabReplace   = "",
             verbose      = Preferences.get("useVerboseDiff"),
             numLineOld   = 0,
             numLineNew   = 0,
             lastStatus   = 0,
             diffData     = [];
 
+        var i = Preferences.getGlobal("tabSize");
+        while (i--) {
+            tabReplace += " ";
+        }
+
         var LINE_STATUS = {
             HEADER: 0,
             UNCHANGED: 1,
@@ -166,7 +171,10 @@ define(function (require, exports, module) {
                 // removes ZERO WIDTH NO-BREAK SPACE character (BOM)
                 line = line.replace(/\uFEFF/g, "");
 
-                line = _.escape(line).replace(/\s/g, " ");
+                line = _.escape(line)
+                    .replace(/\t/g, tabReplace)
+                    .replace(/\s/g, " ");
+
                 line = line.replace(/( )+$/g, function (trailingWhitespace) {
                     return "<span class='trailingWhitespace'>" + trailingWhitespace + "</span>";
                 });
@@ -176,8 +184,7 @@ define(function (require, exports, module) {
                         "numLineOld": _numLineOld,
                         "numLineNew": _numLineNew,
                         "line": line,
-                        "lineClass": lineClass,
-                        "tabSize": tabSize
+                        "lineClass": lineClass
                     });
                 }
             }

templates/format-diff.html

@@ -8,7 +8,7 @@
                 <tr class="diff-row {{lineClass}}">
                     <td class="row-num">{{numLineOld}}</td>
                     <td class="row-num">{{numLineNew}}</td>
-                    <td><pre style="tab-size: {{tabSize}}">{{{line}}}</pre></td>
+                    <td><pre>{{{line}}}</pre></td>
                 </tr>
             {{/lines}}
             <tr class="separator"></tr>