mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae
This commit is contained in:
committed by
AzureDataStudio
parent
a971aee5bd
commit
5e7071e466
7
src/bootstrap-window.js
vendored
7
src/bootstrap-window.js
vendored
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user