Changeset 92766 in webkit

Timestamp:

Aug 10, 2011, 7:01:09 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: CSS editing file containing tabs leads to the whole file change in revision history.
​https://bugs.webkit.org/show_bug.cgi?id=65959

Reviewed by Yury Semikhatsky.

Source/WebCore:

• inspector/front-end/SourceFrame.js:

(WebInspector.SourceFrame):

• inspector/front-end/TextEditorModel.js:

(WebInspector.TextEditorModel.prototype._innerSetText):

LayoutTests:

• inspector/editor/text-editor-model-replace-tabs-expected.txt: Removed.
• inspector/editor/text-editor-model-replace-tabs.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-model-replace-tabs-expected.txt (deleted)
• LayoutTests/inspector/editor/text-editor-model-replace-tabs.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/SourceFrame.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/TextEditorModel.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-10  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: CSS editing file containing tabs leads to the whole file change in revision history.
+        https://bugs.webkit.org/show_bug.cgi?id=65959
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/editor/text-editor-model-replace-tabs-expected.txt: Removed.
+        * inspector/editor/text-editor-model-replace-tabs.html: Removed.
+
 2011-08-10  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-10  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: CSS editing file containing tabs leads to the whole file change in revision history.
+        https://bugs.webkit.org/show_bug.cgi?id=65959
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame):
+        * inspector/front-end/TextEditorModel.js:
+        (WebInspector.TextEditorModel.prototype._innerSetText):
+
 2011-08-10  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/SourceFrame.js

@@ -38 +38 @@
 
     this._textModel = new WebInspector.TextEditorModel();
-    this._textModel.replaceTabsWithSpaces = true;
 
     var textViewerDelegate = new WebInspector.TextViewerDelegateForSourceFrame(this);

trunk/Source/WebCore/inspector/front-end/TextEditorModel.js

@@ -107 +107 @@
     },
 
-    set replaceTabsWithSpaces(replaceTabsWithSpaces)
-    {
-        this._replaceTabsWithSpaces = replaceTabsWithSpaces;
-    },
-
     _innerSetText: function(range, text)
     {
@@ -119 +114 @@
 
         var newLines = text.split(/\r?\n/);
-        this._replaceTabsIfNeeded(newLines);
 
         var prefix = this._lines[range.startLine].substring(0, range.startColumn);
@@ -138 +132 @@
         return new WebInspector.TextRange(range.startLine, range.startColumn,
                                           range.startLine + newLines.length - 1, postCaret);
-    },
-
-    _replaceTabsIfNeeded: function(lines)
-    {
-        if (!this._replaceTabsWithSpaces)
-            return;
-        var spaces = [ "    ", "   ", "  ", " "];
-        for (var i = 0; i < lines.length; ++i) {
-            var line = lines[i];
-            var caretIndex = 0;
-            var index = line.indexOf("\t", caretIndex);
-            var buffer = [];
-            var offset = 0;
-            while (index !== -1) {
-                if (index > caretIndex) {
-                    offset += index - caretIndex;
-                    buffer.push(line.substring(caretIndex, index));
-                }
-                caretIndex = index + 1;
-                var space = spaces[offset % 4];
-                offset += space.length;
-                buffer.push(space);
-                index = line.indexOf("\t", caretIndex);
-            }
-            if (line.length > caretIndex)
-                buffer.push(line.substring(caretIndex));
-            lines[i] = buffer.join("");
-        }
     },