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

Merge from vscode 2e5312cd61ff99c570299ecc122c52584265eda2

Browse Source
This commit is contained in:
ADS Merger
2020-04-23 02:50:35 +00:00
committed by Anthony Dresser
parent 3603f55d97
commit 7f1d8fc32f
659 changed files with 22709 additions and 12497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/notebook/src/book/bookTreeView.ts
View File

@@ -138,7 +138,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
@debounce(1500)
async fireBookRefresh(book: BookModel): Promise<void> {
await book.initializeContents().then(() => {
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(undefined);
});
}
@@ -154,7 +154,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
if (this.currentBook === deletedBook) {
this.currentBook = this.books.length > 0 ? this.books[this.books.length - 1] : undefined;
}
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(undefined);
}
} catch (e) {
vscode.window.showErrorMessage(loc.closeBookError(book.root, e instanceof Error ? e.message : e));
@@ -313,7 +313,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
if (untitledBookIndex > -1) {
this.books.splice(untitledBookIndex, 1);
this.currentBook = undefined;
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(undefined);
vscode.commands.executeCommand('bookTreeView.openBook', destinationUri.fsPath, false, undefined);
}
}

1
extensions/notebook/src/test/common/stubs.ts
View File

@@ -12,6 +12,7 @@ export class MockExtensionContext implements vscode.ExtensionContext {
workspaceState: vscode.Memento;
globalState: vscode.Memento;
extensionPath: string;
extensionUri: vscode.Uri;
asAbsolutePath(relativePath: string): string {
return relativePath;
}

4
extensions/notebook/src/test/managePackages/managePackagesDialog.test.ts
View File

@@ -70,7 +70,7 @@ describe('Manage Package Dialog', () => {
displayName: 'dl2',
name: 'nl2'
};
testContext.onClick.fire();
testContext.onClick.fire(undefined);
testContext.dialog.verify(x => x.changeLocation('nl2'), TypeMoq.Times.once());
testContext.dialog.verify(x => x.resetPages(), TypeMoq.Times.once());
@@ -100,7 +100,7 @@ describe('Manage Package Dialog', () => {
displayName: 'dl2',
name: 'nl2'
};
testContext.onClick.fire();
testContext.onClick.fire(undefined);
testContext.dialog.verify(x => x.changeLocation('nl2'), TypeMoq.Times.once());
testContext.dialog.verify(x => x.showErrorMessage(TypeMoq.It.isAny()), TypeMoq.Times.once());