ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -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/sql/workbench/browser/modelComponents/diffeditor.component.ts
View File

@@ -121,13 +121,13 @@ export default class DiffEditorComponent extends ComponentBase<azdata.DiffEditor
return uri;
}
ngOnDestroy(): void {
override ngOnDestroy(): void {
this.baseDestroy();
}
/// IComponent implementation
public layout(): void {
public override layout(): void {
let width: number = convertSizeToNumber(this.width);
let height: number = convertSizeToNumber(this.height);
if (this._isAutoResizable) {
@@ -167,7 +167,7 @@ export default class DiffEditorComponent extends ComponentBase<azdata.DiffEditor
// TODO allow configuring the look and feel
}
public setProperties(properties: { [key: string]: any; }): void {
public override setProperties(properties: { [key: string]: any; }): void {
super.setProperties(properties);
if (this.contentLeft !== this._renderedContentLeft || this.contentRight !== this._renderedContentRight) {
this.updateModel();