Bug 1196047 - Move indentation.js to devtools/shared. r=bgrins

devtools/client/sourceeditor/editor.js

@@ -13,7 +13,7 @@ const {
   TAB_SIZE,
   DETECT_INDENT,
   getIndentationFromIteration
-} = require("devtools/shared/shared/indentation");
+} = require("devtools/shared/indentation");
 
 const ENABLE_CODE_FOLDING = "devtools.editor.enableCodeFolding";
 const KEYMAP      = "devtools.editor.keymap";

devtools/server/actors/stylesheets.js

@@ -26,7 +26,7 @@ loader.lazyGetter(this, "CssLogic", () => require("devtools/shared/styleinspecto
 const {
   getIndentationFromPrefs,
   getIndentationFromString
-} = require("devtools/shared/shared/indentation");
+} = require("devtools/shared/indentation");
 
 var TRANSITION_CLASS = "moz-styleeditor-transitioning";
 var TRANSITION_DURATION_MS = 500;

devtools/shared/moz.build

@@ -41,6 +41,7 @@ DevToolsModules(
     'DevToolsUtils.js',
     'event-emitter.js',
     'event-parsers.js',
+    'indentation.js',
     'Loader.jsm',
     'output-parser.js',
     'path.js',

devtools/shared/shared/moz.build

@@ -5,12 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
-XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 DevToolsModules(
   'async-storage.js',
   'framerate.js',
-  'indentation.js',
   'memory.js',
   'profiler.js',
   'timeline.js',

devtools/shared/shared/tests/unit/.eslintrc

@@ -1,4 +0,0 @@
-{
-  // Extend from the common devtools xpcshell eslintrc config.
-  "extends": "../../../../../devtools/.eslintrc.xpcshell"
-}

devtools/shared/shared/tests/unit/xpcshell.ini

@@ -1,6 +0,0 @@
-[DEFAULT]
-head =
-tail =
-skip-if = toolkit == 'gonk' && debug # Bug 1206586
-
-[test_indentation.js]

devtools/shared/tests/unit/test_indentation.js

@@ -3,8 +3,6 @@
 
 "use strict";
 
-var Cu = Components.utils;
-const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm");
 const Services = require("Services");
 const {
   EXPAND_TAB,
@@ -13,7 +11,7 @@ const {
   getIndentationFromPrefs,
   getIndentationFromIteration,
   getIndentationFromString,
-} = require("devtools/shared/shared/indentation");
+} = require("devtools/shared/indentation");
 
 function test_indent_from_prefs() {
   Services.prefs.setBoolPref(DETECT_INDENT, true);

devtools/shared/tests/unit/xpcshell.ini

@@ -10,6 +10,7 @@ support-files =
 [test_fetch-file.js]
 [test_fetch-http.js]
 [test_fetch-resource.js]
+[test_indentation.js]
 [test_independent_loaders.js]
 [test_invisible_loader.js]
 [test_safeErrorString.js]