forked from mirrors/gecko-dev
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
118 lines
2.9 KiB
JavaScript
118 lines
2.9 KiB
JavaScript
/* eslint-env mozilla/frame-script */
|
|
// eslint-disable-next-line mozilla/reject-importGlobalProperties
|
|
Cu.importGlobalProperties(["File"]);
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
function createProfDFile() {
|
|
return Services.dirsvc.QueryInterface(Ci.nsIProperties).get("ProfD", Ci.nsIFile);
|
|
}
|
|
|
|
// Creates a parametric arity directory hierarchy as a function of depth.
|
|
// Each directory contains one leaf file, and subdirectories of depth [1, depth).
|
|
// e.g. for depth 3:
|
|
//
|
|
// subdir3
|
|
// - file.txt
|
|
// - subdir2
|
|
// - file.txt
|
|
// - subdir1
|
|
// - file.txt
|
|
// - subdir1
|
|
// - file.txt
|
|
//
|
|
// Returns the parent directory of the subtree.
|
|
function createTreeFile(depth, parent) {
|
|
if (!parent) {
|
|
parent = Services.dirsvc.QueryInterface(Ci.nsIProperties).get("TmpD", Ci.nsIFile);
|
|
parent.append("dir-tree-test");
|
|
parent.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o700);
|
|
}
|
|
|
|
var nextFile = parent.clone();
|
|
if (depth == 0) {
|
|
nextFile.append("file.txt");
|
|
nextFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o600);
|
|
} else {
|
|
nextFile.append("subdir" + depth);
|
|
nextFile.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o700);
|
|
// Decrement the maximal depth by one for each level of nesting.
|
|
for (var i = 0; i < depth; i++) {
|
|
createTreeFile(i, nextFile);
|
|
}
|
|
}
|
|
|
|
return parent;
|
|
}
|
|
|
|
function createRootFile() {
|
|
var testFile = createProfDFile();
|
|
|
|
// Let's go back to the root of the FileSystem
|
|
while (true) {
|
|
var parent = testFile.parent;
|
|
if (!parent) {
|
|
break;
|
|
}
|
|
|
|
testFile = parent;
|
|
}
|
|
|
|
return testFile;
|
|
}
|
|
|
|
function createTestFile() {
|
|
var tmpFile = Services.dirsvc.QueryInterface(Ci.nsIProperties).get("TmpD", Ci.nsIFile);
|
|
tmpFile.append("dir-test");
|
|
tmpFile.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o700);
|
|
|
|
var file1 = tmpFile.clone();
|
|
file1.append("foo.txt");
|
|
file1.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o600);
|
|
|
|
var dir = tmpFile.clone();
|
|
dir.append("subdir");
|
|
dir.create(Ci.nsIFile.DIRECTORY_TYPE, 0o700);
|
|
|
|
var file2 = dir.clone();
|
|
file2.append("bar.txt");
|
|
file2.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o600);
|
|
|
|
return tmpFile;
|
|
}
|
|
|
|
addMessageListener("dir.open", function(e) {
|
|
var testFile;
|
|
|
|
switch (e.path) {
|
|
case "ProfD":
|
|
// Note that files in the profile directory are not guaranteed to persist-
|
|
// see bug 1284742.
|
|
testFile = createProfDFile();
|
|
break;
|
|
|
|
case "root":
|
|
testFile = createRootFile();
|
|
break;
|
|
|
|
case "test":
|
|
testFile = createTestFile();
|
|
break;
|
|
|
|
case "tree":
|
|
testFile = createTreeFile(3);
|
|
break;
|
|
}
|
|
|
|
sendAsyncMessage("dir.opened", {
|
|
dir: testFile.path,
|
|
name: testFile.leafName,
|
|
});
|
|
});
|
|
|
|
addMessageListener("file.open", function(e) {
|
|
var testFile = Services.dirsvc.QueryInterface(Ci.nsIProperties).get("ProfD", Ci.nsIFile);
|
|
testFile.append("prefs.js");
|
|
|
|
File.createFromNsIFile(testFile).then(function(file) {
|
|
sendAsyncMessage("file.opened", { file });
|
|
});
|
|
});
|