提交 38e76c02 编写于 作者: B Benjamin Pasero

fix bootstrap issues

上级 53129dfd
......@@ -31,7 +31,7 @@ exports.assign = function assign(destination, source) {
*
* @param {string[]} modulePaths
* @param {(result, configuration) => any} resultCallback
* @param {{ removeDeveloperKeybindingsAfterLoad: boolean, canModifyDOM: (config) => void, beforeLoaderConfig: (config, loaderConfig) => void, beforeRequire: () => void }=} options
* @param {{ forceEnableDeveloperKeybindings?: boolean, removeDeveloperKeybindingsAfterLoad?: boolean, canModifyDOM?: (config) => void, beforeLoaderConfig?: (config, loaderConfig) => void, beforeRequire?: () => void }=} options
*/
exports.load = function (modulePaths, resultCallback, options) {
// @ts-ignore
......@@ -47,7 +47,7 @@ exports.load = function (modulePaths, resultCallback, options) {
// Developer tools
const enableDeveloperTools = (process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath;
let developerToolsUnbind;
if (enableDeveloperTools) {
if (enableDeveloperTools || (options && options.forceEnableDeveloperKeybindings)) {
developerToolsUnbind = registerDeveloperKeybindings();
}
......@@ -122,7 +122,7 @@ exports.load = function (modulePaths, resultCallback, options) {
const callbackResult = resultCallback(result, configuration);
if (callbackResult && typeof callbackResult.then === 'function') {
callbackResult.then(() => {
if (options && options.removeDeveloperKeybindingsAfterLoad) {
if (developerToolsUnbind && options && options.removeDeveloperKeybindingsAfterLoad) {
developerToolsUnbind();
}
}, error => {
......
......@@ -10,4 +10,4 @@ const bootstrapWindow = require('../../../../bootstrap-window');
bootstrapWindow.load(['vs/code/electron-browser/issue/issueReporterMain'], function (issueReporter, configuration) {
issueReporter.startup(configuration);
});
\ No newline at end of file
}, { forceEnableDeveloperKeybindings: true });
\ No newline at end of file
......@@ -10,4 +10,4 @@ const bootstrapWindow = require('../../../../bootstrap-window');
bootstrapWindow.load(['vs/code/electron-browser/processExplorer/processExplorerMain'], function (processExplorer, configuration) {
processExplorer.startup(configuration.data);
});
\ No newline at end of file
}, { forceEnableDeveloperKeybindings: true });
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册