Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

This commit is contained in:
Anthony Dresser
2019-03-26 11:43:38 -07:00
committed by GitHub
parent b1393ae615
commit 0d8ef9583b
268 changed files with 5947 additions and 3422 deletions

View File

@@ -31,7 +31,6 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
import { TreeNodeContextKey } from 'sql/parts/objectExplorer/viewlet/treeNodeContextKey';
import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
import * as constants from 'sql/common/constants';
import { ServerInfoContextKey } from 'sql/parts/connection/common/serverInfoContextKey';
/**
@@ -101,7 +100,7 @@ export class ServerTreeActionProvider extends ContributableActionProvider {
let actions = getDefaultActions(context);
let options = { arg: undefined, shouldForwardArgs: true };
const groups = menu.getActions(options);
fillInActions(groups, actions, this.contextMenuService);
fillInActions(groups, actions, false);
// Cleanup
scopedContextService.dispose();