Backed out changeset 2566c7e54dcf (bug 993162) for suspecting this caused dt tools bustage on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 16 Apr 2014 11:14:09 +0200
changeset 179204 dc87f47062ce7736bebfe059279517370db47d7d
parent 179203 3be10cad99a827b08b433cac25d68bd1a96c5675
child 179205 e7a76c895edc11264fd210bfd32dabae499fafbb
child 179319 8e92a7640d74738496f421c260647ee0636f8103
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
bugs993162
milestone31.0a1
backs out2566c7e54dcfc329337821881d48fddc7584b32f
Backed out changeset 2566c7e54dcf (bug 993162) for suspecting this caused dt tools bustage on a CLOSED TREE
browser/app/profile/firefox.js
browser/devtools/sourceeditor/test/browser_detectindent.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1278,17 +1278,17 @@ pref("devtools.hud.loglimit.console", 20
 pref("devtools.eyedropper.zoom", 6);
 
 // The developer tools editor configuration:
 // - tabsize: how many spaces to use when a Tab character is displayed.
 // - expandtab: expand Tab characters to spaces.
 // - keymap: which keymap to use (can be 'default', 'emacs' or 'vim')
 // - autoclosebrackets: whether to permit automatic bracket/quote closing.
 // - detectindentation: whether to detect the indentation from the file
-pref("devtools.editor.tabsize", 2);
+pref("devtools.editor.tabsize", 4);
 pref("devtools.editor.expandtab", true);
 pref("devtools.editor.keymap", "default");
 pref("devtools.editor.autoclosebrackets", true);
 pref("devtools.editor.detectindentation", true);
 
 // Enable the Font Inspector
 pref("devtools.fontinspector.enabled", true);
 
--- a/browser/devtools/sourceeditor/test/browser_detectindent.js
+++ b/browser/devtools/sourceeditor/test/browser_detectindent.js
@@ -57,34 +57,34 @@ const TABS_CODE = [
 "}"
 ].join("\n");
 
 
 function test() {
   waitForExplicitFinish();
 
   setup((ed, win) => {
-    is(ed.getOption("indentUnit"), 2,
-       "2 spaces before code added");
+    is(ed.getOption("indentUnit"), 4,
+       "4 spaces before code added");
     is(ed.getOption("indentWithTabs"), false,
        "spaces is default");
 
+    ed.setText(TWO_SPACES_CODE);
+    is(ed.getOption("indentUnit"), 2,
+       "2 spaces detected in 2 space code");
+    is(ed.getOption("indentWithTabs"), false,
+       "spaces detected in 2 space code");
+
     ed.setText(FOUR_SPACES_CODE);
     is(ed.getOption("indentUnit"), 4,
        "4 spaces detected in 4 space code");
     is(ed.getOption("indentWithTabs"), false,
        "spaces detected in 4 space code");
 
-    ed.setText(TWO_SPACES_CODE);
-    is(ed.getOption("indentUnit"), 2,
-       "2 spaces detected in 2 space code");
-    is(ed.getOption("indentWithTabs"), false,
-       "spaces detected in 2 space code");
-
     ed.setText(TABS_CODE);
-    is(ed.getOption("indentUnit"), 2,
-       "2 space indentation unit");
+    is(ed.getOption("indentUnit"), 4,
+       "4 space indentation unit");
     is(ed.getOption("indentWithTabs"), true,
        "tabs detected in majority tabs code");
 
     teardown(ed, win);
   });
 }