mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 01:32:34 -05:00
VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)
* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9 * delete unused folders * distro * Bump build node version * update chokidar * FIx hygiene errors * distro * Fix extension lint issues * Remove strict-vscode * Add copyright header exemptions * Bump vscode-extension-telemetry to fix webpacking issue with zone.js * distro * Fix failing tests (revert marked.js back to current one until we decide to update) * Skip searchmodel test * Fix mac build * temp debug script loading * Try disabling coverage * log error too * Revert "log error too" This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f. * Revert "temp debug script loading" This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c. * Add comments explaining coverage disabling * Fix ansi_up loading issue * Merge latest from ads * Use newer option * Fix compile * add debug logging warn * Always log stack * log more * undo debug * Update to use correct base path (+cleanup) * distro * fix compile errors * Remove strict-vscode * Fix sql editors not showing * Show db dropdown input & fix styling * Fix more info in gallery * Fix gallery asset requests * Delete unused workflow * Fix tapable resolutions for smoke test compile error * Fix smoke compile * Disable crash reporting * Disable interactive Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
@@ -628,7 +628,7 @@ var AMDLoader;
|
||||
}
|
||||
/**
|
||||
* Attach load / error listeners to a script element and remove them when either one has fired.
|
||||
* Implemented for browssers supporting HTML5 standard 'load' and 'error' events.
|
||||
* Implemented for browsers supporting HTML5 standard 'load' and 'error' events.
|
||||
*/
|
||||
BrowserScriptLoader.prototype.attachListeners = function (script, callback, errorback) {
|
||||
var unbind = function () {
|
||||
@@ -1246,7 +1246,7 @@ var AMDLoader;
|
||||
this._knownModules2 = [];
|
||||
this._inverseDependencies2 = [];
|
||||
this._inversePluginDependencies2 = new Map();
|
||||
this._currentAnnonymousDefineCall = null;
|
||||
this._currentAnonymousDefineCall = null;
|
||||
this._recorder = null;
|
||||
this._buildInfoPath = [];
|
||||
this._buildInfoDefineStack = [];
|
||||
@@ -1328,18 +1328,18 @@ var AMDLoader;
|
||||
};
|
||||
/**
|
||||
* Defines an anonymous module (without an id). Its name will be resolved as we receive a callback from the scriptLoader.
|
||||
* @param dependecies @see defineModule
|
||||
* @param dependencies @see defineModule
|
||||
* @param callback @see defineModule
|
||||
*/
|
||||
ModuleManager.prototype.enqueueDefineAnonymousModule = function (dependencies, callback) {
|
||||
if (this._currentAnnonymousDefineCall !== null) {
|
||||
if (this._currentAnonymousDefineCall !== null) {
|
||||
throw new Error('Can only have one anonymous define call per script file');
|
||||
}
|
||||
var stack = null;
|
||||
if (this._config.isBuild()) {
|
||||
stack = new Error('StackLocation').stack || null;
|
||||
}
|
||||
this._currentAnnonymousDefineCall = {
|
||||
this._currentAnonymousDefineCall = {
|
||||
stack: stack,
|
||||
dependencies: dependencies,
|
||||
callback: callback
|
||||
@@ -1446,9 +1446,9 @@ var AMDLoader;
|
||||
* This means its code is available and has been executed.
|
||||
*/
|
||||
ModuleManager.prototype._onLoad = function (moduleId) {
|
||||
if (this._currentAnnonymousDefineCall !== null) {
|
||||
var defineCall = this._currentAnnonymousDefineCall;
|
||||
this._currentAnnonymousDefineCall = null;
|
||||
if (this._currentAnonymousDefineCall !== null) {
|
||||
var defineCall = this._currentAnonymousDefineCall;
|
||||
this._currentAnonymousDefineCall = null;
|
||||
// Hit an anonymous define call
|
||||
this.defineModule(this._moduleIdProvider.getStrModuleId(moduleId), defineCall.dependencies, defineCall.callback, null, defineCall.stack);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user