Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions

View File

@@ -18,7 +18,6 @@ exports.assign = function assign(destination, source) {
};
/**
*
* @param {string[]} modulePaths
* @param {(result, configuration: object) => any} resultCallback
* @param {{ forceEnableDeveloperKeybindings?: boolean, disallowReloadKeybinding?: boolean, removeDeveloperKeybindingsAfterLoad?: boolean, canModifyDOM?: (config: object) => void, beforeLoaderConfig?: (config: object, loaderConfig: object) => void, beforeRequire?: () => void }=} options
@@ -218,6 +217,10 @@ function registerDeveloperKeybindings(disallowReloadKeybinding) {
};
}
/**
* @param {string | Error} error
* @param {boolean} enableDeveloperTools
*/
function onUnexpectedError(error, enableDeveloperTools) {
const ipc = require('electron').ipcRenderer;
@@ -228,7 +231,7 @@ function onUnexpectedError(error, enableDeveloperTools) {
console.error('[uncaught exception]: ' + error);
if (error && error.stack) {
if (error && typeof error !== 'string' && error.stack) {
console.error(error.stack);
}
}