diff --git a/devtools/client/debugger/debugger-controller.js b/devtools/client/debugger/debugger-controller.js index 1311d4f05e2a..e9eacceb2b5d 100644 --- a/devtools/client/debugger/debugger-controller.js +++ b/devtools/client/debugger/debugger-controller.js @@ -122,7 +122,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Parser", - "resource:///modules/devtools/client/shared/Parser.jsm"); + "resource://gre/modules/devtools/shared/Parser.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js index f8dde38f280e..60b3acb532c3 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); let source = "let x = 42;"; let parser = new Parser(); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js index 59fe2c275710..a52bfd535ce7 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); let source = "let x + 42;"; let parser = new Parser(); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js index e6c79b20ca01..314fc8f405a2 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); let source = [ "", diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js index 9fb34a2cadc3..692d5d7bfa49 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); let source = [ "", diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js index 4db51d70eb3d..4caaaa425063 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js @@ -7,7 +7,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); let source = [ "let a = [];", diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js index cf07530bd36f..cc6c48bb0f19 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js @@ -8,7 +8,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); function verify(source, predicate, [sline, scol], [eline, ecol]) { let ast = Parser.reflectionAPI.parse(source); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js index 93102da27969..a961775fc08c 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js @@ -7,7 +7,7 @@ */ function test() { - let { ParserHelpers } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + let { ParserHelpers } = Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); let node1 = { loc: { start: { line: 1, column: 10 }, diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js index a557872b8f5b..c4bfd2ac42b6 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js @@ -7,7 +7,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); function verify(source, predicate, details) { let { name, chain } = details; diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js index 341850c115ab..c4aee34cefff 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js @@ -8,7 +8,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); function verify(source, predicate, details) { let { name, chain } = details; diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js index ca732de0581d..89b640b65391 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js @@ -7,7 +7,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/shared/Parser.jsm", {}); function verify(source, predicate, string) { let ast = Parser.reflectionAPI.parse(source); diff --git a/devtools/client/shared/moz.build b/devtools/client/shared/moz.build index b86e0d019861..db253dceb6c0 100644 --- a/devtools/client/shared/moz.build +++ b/devtools/client/shared/moz.build @@ -30,7 +30,6 @@ DevToolsModules( 'node-attribute-parser.js', 'observable-object.js', 'options-view.js', - 'Parser.jsm', 'poller.js', 'source-utils.js', 'SplitView.jsm', diff --git a/devtools/client/shared/Parser.jsm b/devtools/shared/Parser.jsm similarity index 100% rename from devtools/client/shared/Parser.jsm rename to devtools/shared/Parser.jsm diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build index 0197a03dd8da..f852e0cb2ce5 100644 --- a/devtools/shared/moz.build +++ b/devtools/shared/moz.build @@ -44,6 +44,7 @@ DevToolsModules( 'indentation.js', 'Loader.jsm', 'output-parser.js', + 'Parser.jsm', 'path.js', 'system.js', )