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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts
View File

@@ -77,7 +77,7 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
this.registerActions();
}
protected renderTreeView(container: HTMLElement): void {
protected override renderTreeView(container: HTMLElement): void {
super.renderTreeView(DOM.append(container, DOM.$('')));
this.createButtons(container);
@@ -101,7 +101,7 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
this._register(this.cancelButton.onDidClick(() => this.cancel()));
}
protected layoutTreeView(height: number, width: number): void {
protected override layoutTreeView(height: number, width: number): void {
const buttonContainerHeight = 78;
this.buttonsContainer.style.height = `${buttonContainerHeight}px`;
this.buttonsContainer.style.width = `${width}px`;
@@ -499,7 +499,7 @@ class AcceptChangesContribution extends Disposable implements IEditorContributio
this.acceptChangesButton = undefined;
}
dispose(): void {
override dispose(): void {
this.disposeAcceptChangesWidgetRenderer();
super.dispose();
}