ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the error showing up in console log (#23018)

Browse Source
This commit is contained in:
Aasim Khan
2023-05-08 08:29:39 -07:00
committed by GitHub
parent ff3f6d53c7
commit 3ae97b81f2
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts
View File

@@ -33,6 +33,8 @@ import { ILogService } from 'vs/platform/log/common/log';
*/ */
export class ServerTreeActionProvider { export class ServerTreeActionProvider {
private scopedContextService: IContextKeyService;
constructor( constructor(
@IInstantiationService private _instantiationService: IInstantiationService, @IInstantiationService private _instantiationService: IInstantiationService,
@IConnectionManagementService private _connectionManagementService: IConnectionManagementService, @IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
@@ -142,7 +144,6 @@ export class ServerTreeActionProvider {
} }
// Cleanup // Cleanup
scopedContextService.dispose();
menu.dispose(); menu.dispose();
return actions; return actions;
@@ -166,22 +167,28 @@ export class ServerTreeActionProvider {
} }
private getContextKeyService(context: ObjectExplorerContext): IContextKeyService { private getContextKeyService(context: ObjectExplorerContext): IContextKeyService {
let scopedContextService = this._contextKeyService.createScoped(context.tree.getHTMLElement()); if (!this.scopedContextService) {
let connectionContextKey = new ConnectionContextKey(scopedContextService, this._queryManagementService); if (context.tree instanceof AsyncServerTree) {
this.scopedContextService = context.tree.contextKeyService;
} else {
this.scopedContextService = this._contextKeyService.createScoped(context.tree.getHTMLElement());
}
}
let connectionContextKey = new ConnectionContextKey(this.scopedContextService, this._queryManagementService);
let connectionProfile = context && context.profile; let connectionProfile = context && context.profile;
connectionContextKey.set(connectionProfile); connectionContextKey.set(connectionProfile);
let serverInfoContextKey = new ServerInfoContextKey(scopedContextService); let serverInfoContextKey = new ServerInfoContextKey(this.scopedContextService);
if (connectionProfile.id) { if (connectionProfile.id) {
let serverInfo = this._connectionManagementService.getServerInfo(connectionProfile.id); let serverInfo = this._connectionManagementService.getServerInfo(connectionProfile.id);
if (serverInfo) { if (serverInfo) {
serverInfoContextKey.set(serverInfo); serverInfoContextKey.set(serverInfo);
} }
} }
let treeNodeContextKey = new TreeNodeContextKey(scopedContextService, this._capabilitiesService); let treeNodeContextKey = new TreeNodeContextKey(this.scopedContextService, this._capabilitiesService);
if (context.treeNode) { if (context.treeNode) {
treeNodeContextKey.set(context.treeNode); treeNodeContextKey.set(context.treeNode);
} }
return scopedContextService; return this.scopedContextService;
} }
/** /**