Changeset 248739 in webkit

Timestamp:

Aug 15, 2019 12:32:14 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: CodeMirror still inserts a tab even when "Prefer indent using" is set to "Spaces"
​https://bugs.webkit.org/show_bug.cgi?id=200770

Reviewed by Ross Kirsling.

• UserInterface/Views/CodeMirrorAdditions.js:

Remap the insertTab command to use insertSoftTab when "Prefer indent using" is set to
"Spaces" so that CodeMirror inserts the number of spaces that would match a tab ("\t") being
inserted at the same spot.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CodeMirrorAdditions.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-08-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: CodeMirror still inserts a tab even when "Prefer indent using" is set to "Spaces"
+        https://bugs.webkit.org/show_bug.cgi?id=200770
+
+        Reviewed by Ross Kirsling.
+
+        * UserInterface/Views/CodeMirrorAdditions.js:
+        Remap the `insertTab` command to use `insertSoftTab` when "Prefer indent using" is set to
+        "Spaces" so that CodeMirror inserts the number of spaces that would match a tab ("\t") being
+        inserted at the same spot.
+
 2019-08-15  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js

@@ -620 +620 @@
     };
 
+    {
+        // CodeMirror's default behavior is to always insert a tab ("\t") regardless of `indentWithTabs`.
+        let original = CodeMirror.commands.insertTab;
+        CodeMirror.commands.insertTab = function(cm) {
+            if (cm.options.indentWithTabs)
+                original(cm);
+            else
+                CodeMirror.commands.insertSoftTab(cm);
+        };
+    }
+
     // Register some extra MIME-types for CodeMirror. These are in addition to the
     // ones CodeMirror already registers, like text/html, text/javascript, etc.