ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 01:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 8a997f7321ae6612fc0e6eb3eac4f358a6233bfb

Browse Source
This commit is contained in:
ADS Merger
2020-02-11 07:08:19 +00:00
parent 0f934081e1
commit 085752f111
217 changed files with 2561 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
View File

@@ -1063,7 +1063,7 @@ export class DirtyDiffModel extends Disposable {
return this.diffDelayer
.trigger(() => this.diff())
.then((changes: IChange[]) => {
.then((changes: IChange[] | null) => {
if (!this._editorModel || this._editorModel.isDisposed() || !this._originalModel || this._originalModel.isDisposed()) {
return; // disposed
}
@@ -1072,6 +1072,10 @@ export class DirtyDiffModel extends Disposable {
changes = [];
}
if (!changes) {
changes = [];
}
const diff = sortedDiff(this._changes, changes, compareChanges);
this._changes = changes;
this._onDidChange.fire({ changes, diff });

2
src/vs/workbench/contrib/scm/browser/mainPane.ts
View File

@@ -196,7 +196,7 @@ export class MainPane extends ViewPane {
const renderer = this.instantiationService.createInstance(ProviderRenderer);
const identityProvider = { getId: (r: ISCMRepository) => r.provider.id };
this.list = this.instantiationService.createInstance<typeof WorkbenchList, WorkbenchList<ISCMRepository>>(WorkbenchList, `SCM Main`, container, delegate, [renderer], {
this.list = <WorkbenchList<ISCMRepository>>this.instantiationService.createInstance(WorkbenchList, `SCM Main`, container, delegate, [renderer], {
identityProvider,
horizontalScrolling: false,
overrideStyles: {

2
src/vs/workbench/contrib/scm/browser/repositoryPane.ts
View File

@@ -825,7 +825,7 @@ export class RepositoryPane extends ViewPane {
const keyboardNavigationLabelProvider = new SCMTreeKeyboardNavigationLabelProvider();
const identityProvider = new SCMResourceIdentityProvider();
this.tree = this.instantiationService.createInstance<typeof WorkbenchCompressibleObjectTree, WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>>(
this.tree = <WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>>this.instantiationService.createInstance(
WorkbenchCompressibleObjectTree,
'SCM Tree Repo',
this.listContainer,