ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-28 17:23:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts
View File

@@ -9,7 +9,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { DataExplorerViewletViewsContribution, OpenDataExplorerViewletAction } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet';
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';

3
src/sql/workbench/contrib/dataExplorer/browser/dataExplorerExtensionPoint.ts
View File

@@ -17,8 +17,7 @@ import { coalesce } from 'vs/base/common/arrays';
import { VIEWLET_ID } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ICustomViewDescriptor } from 'vs/workbench/api/browser/viewsExtensionPoint';
import { CustomTreeView as VSCustomTreeView } from 'vs/workbench/contrib/views/browser/treeView';
import { TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
import { CustomTreeView as VSCustomTreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
import { CustomTreeView } from 'sql/workbench/contrib/views/browser/treeView';
interface IUserFriendlyViewDescriptor {

12
src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts
View File

@@ -6,7 +6,7 @@
import { localize } from 'vs/nls';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { IAction } from 'vs/base/common/actions';
import { append, $, addClass, toggleClass, Dimension } from 'vs/base/browser/dom';
import { toggleClass, Dimension } from 'vs/base/browser/dom';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -89,8 +89,6 @@ export class DataExplorerViewlet extends Viewlet {
export class DataExplorerViewPaneContainer extends ViewPaneContainer {
private root?: HTMLElement;
private dataSourcesBox?: HTMLElement;
constructor(
@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@ITelemetryService telemetryService: ITelemetryService,
@@ -109,12 +107,10 @@ export class DataExplorerViewPaneContainer extends ViewPaneContainer {
}
create(parent: HTMLElement): void {
addClass(parent, 'dataExplorer-viewlet');
this.root = parent;
this.dataSourcesBox = append(this.root, $('.dataSources'));
return super.create(this.dataSourcesBox);
super.create(parent);
parent.classList.add('dataExplorer-viewlet');
}
public updateStyles(): void {
@@ -156,7 +152,7 @@ export const VIEW_CONTAINER = Registry.as<IViewContainersRegistry>(ViewContainer
id: VIEWLET_ID,
name: localize('dataexplorer.name', "Connections"),
ctorDescriptor: new SyncDescriptor(DataExplorerViewPaneContainer),
icon: 'dataExplorer',
icon: { id: 'dataExplorer' },
order: 0,
storageId: `${VIEWLET_ID}.state`
}, ViewContainerLocation.Sidebar, true);