DevTools: [CodeMirror] indent autodetection should fallback to default indent

Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 94 matching lines @@
         "Cmd-Right": "goLineEnd",
         "Alt-Backspace": "delGroupBefore",
         "Alt-Delete": "delGroupAfter",
         "Cmd-/": "toggleComment",
         "Cmd-D": "selectNextOccurrence",
         "Cmd-U": "undoLastSelection",
         fallthrough: "devtools-common"
     };
 
     WebInspector.settings.textEditorIndent.addChangeListener(this._updateEditorIndentation, this);
+    WebInspector.settings.textEditorAutoDetectIndent.addChangeListener(this._updateEditorIndentation, this);
     this._updateEditorIndentation();
     WebInspector.settings.showWhitespacesInEditor.addChangeListener(this._updateCodeMirrorMode, this);
     WebInspector.settings.textEditorBracketMatching.addChangeListener(this._enableBracketMatchingIfNeeded, this);
     this._enableBracketMatchingIfNeeded();
 
     this._codeMirror.setOption("keyMap", WebInspector.isMac() ? "devtools-mac" : "devtools-pc");
     this._codeMirror.setOption("flattenSpans", false);
 
     this._codeMirror.setOption("maxHighlightLength", WebInspector.CodeMirrorTextEditor.maxHighlightLength);
     this._codeMirror.setOption("mode", null);
@@ skipping 143 matching lines @@
 }
 
 WebInspector.CodeMirrorTextEditor.LongLineModeLineLengthThreshold = 2000;
 WebInspector.CodeMirrorTextEditor.MaximumNumberOfWhitespacesPerSingleSpan = 16;
 WebInspector.CodeMirrorTextEditor.MaxEditableTextSize = 1024 * 1024 * 10;
 
 WebInspector.CodeMirrorTextEditor.prototype = {
     dispose: function()
     {
         WebInspector.settings.textEditorIndent.removeChangeListener(this._updateEditorIndentation, this);
+        WebInspector.settings.textEditorAutoDetectIndent.removeChangeListener(this._updateEditorIndentation, this);
         WebInspector.settings.showWhitespacesInEditor.removeChangeListener(this._updateCodeMirrorMode, this);
         WebInspector.settings.textEditorBracketMatching.removeChangeListener(this._enableBracketMatchingIfNeeded, this);
     },
 
     _enableBracketMatchingIfNeeded: function()
     {
         this._codeMirror.setOption("autoCloseBrackets", WebInspector.settings.textEditorBracketMatching.get() ? { explode: false } : false);
     },
 
     wasShown: function()
@@ skipping 32 matching lines @@
             return "\t";
         var minimumIndent = Infinity;
         for (var i in indents) {
             if (indents[i] < onePercentFilterThreshold)
                 continue;
             var indent = parseInt(i, 10);
             if (minimumIndent > indent)
                 minimumIndent = indent;
         }
         if (minimumIndent === Infinity)
-            return WebInspector.TextUtils.Indent.FourSpaces;
+            return WebInspector.settings.textEditorIndent.get();
         return new Array(minimumIndent + 1).join(" ");
     },
 
     _updateEditorIndentation: function()
     {
         var extraKeys = {};
         var indent = WebInspector.settings.textEditorIndent.get();
         if (WebInspector.settings.textEditorAutoDetectIndent.get())
             indent = this._guessIndentationLevel();
         if (indent === WebInspector.TextUtils.Indent.TabCharacter) {
@@ skipping 1786 matching lines @@
     var backgroundColorRule = backgroundColor ? ".CodeMirror .CodeMirror-selected { background-color: " + backgroundColor + ";}" : "";
     var foregroundColor = InspectorFrontendHost.getSelectionForegroundColor();
     var foregroundColorRule = foregroundColor ? ".CodeMirror .CodeMirror-selectedtext:not(.CodeMirror-persist-highlight) { color: " + foregroundColor + "!important;}" : "";
     if (!foregroundColorRule && !backgroundColorRule)
         return;
 
     var style = document.createElement("style");
     style.textContent = backgroundColorRule + foregroundColorRule;
     document.head.appendChild(style);
 })();