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

Attempt to Fix Unstable Notebooks Tests (#19806)

Browse Source 
* Add check if currentBook exists

* adding checks for currentBook
This commit is contained in:
Chris LaFreniere
2022-06-23 17:14:15 -07:00
committed by GitHub
parent f7958f0a25
commit 1b1117f07d
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
private _bookViewer: vscode.TreeView<BookTreeItem>; private _bookViewer: vscode.TreeView<BookTreeItem>;
public viewId: string; public viewId: string;
public books: BookModel[] = []; public books: BookModel[] = [];
public currentBook: BookModel; public currentBook: BookModel | undefined;
supportedTypes = ['text/treeitems']; supportedTypes = ['text/treeitems'];
constructor(workspaceFolders: vscode.WorkspaceFolder[], extensionContext: vscode.ExtensionContext, openAsUntitled: boolean, view: string, public providerId: string) { constructor(workspaceFolders: vscode.WorkspaceFolder[], extensionContext: vscode.ExtensionContext, openAsUntitled: boolean, view: string, public providerId: string) {
@@ -243,7 +243,10 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
if (showPreview) { if (showPreview) {
this.currentBook = this.books.find(book => book.bookPath === bookPath); this.currentBook = this.books.find(book => book.bookPath === bookPath);
await this._bookViewer.reveal(this.currentBook.bookItems[0], { expand: vscode.TreeItemCollapsibleState.Expanded, focus: true, select: true }); // Only attempt a reveal if current book has been found, but always try to preview the file
if (this.currentBook) {
await this._bookViewer.reveal(this.currentBook.bookItems[0], { expand: vscode.TreeItemCollapsibleState.Expanded, focus: true, select: true });
}
await this.showPreviewFile(urlToOpen); await this.showPreviewFile(urlToOpen);
} }
@@ -688,7 +691,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
getChildren(element?: BookTreeItem): Thenable<BookTreeItem[]> { getChildren(element?: BookTreeItem): Thenable<BookTreeItem[]> {
if (element) { if (element) {
if (element.sections) { if (element.sections && this.currentBook) {
return Promise.resolve(this.currentBook.getSections(element)); return Promise.resolve(this.currentBook.getSections(element));
} else { } else {
return Promise.resolve([]); return Promise.resolve([]);
@@ -709,9 +712,9 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
getUntitledNotebookUri(resource: string): vscode.Uri { getUntitledNotebookUri(resource: string): vscode.Uri {
let untitledFileName = vscode.Uri.parse(`untitled:${resource}`); let untitledFileName = vscode.Uri.parse(`untitled:${resource}`);
if (!this.currentBook.getAllNotebooks().get(untitledFileName.fsPath) && !this.currentBook.getAllNotebooks().get(path.basename(untitledFileName.fsPath))) { if (this.currentBook && !this.currentBook.getAllNotebooks().get(untitledFileName.fsPath)) {
let notebook = this.currentBook.getAllNotebooks().get(resource); let notebookTreeItem = this.currentBook.getAllNotebooks().get(resource);
this.currentBook.getAllNotebooks().set(path.basename(untitledFileName.fsPath), notebook); this.currentBook.getAllNotebooks().set(path.basename(untitledFileName.fsPath), notebookTreeItem);
} }
return untitledFileName; return untitledFileName;
} }