From 173a715a4da67df35dd33809e854ea974d197f1f Mon Sep 17 00:00:00 2001 From: Barbara Valdez <34872381+barbaravaldez@users.noreply.github.com> Date: Fri, 11 Sep 2020 16:39:40 -0700 Subject: [PATCH] Fix pinned notebooks navigator (#12246) --- extensions/notebook/src/book/bookTreeItem.ts | 2 +- extensions/notebook/src/common/appContext.ts | 2 +- extensions/notebook/src/common/constants.ts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/notebook/src/book/bookTreeItem.ts b/extensions/notebook/src/book/bookTreeItem.ts index 912420961e..6d1aa4f79c 100644 --- a/extensions/notebook/src/book/bookTreeItem.ts +++ b/extensions/notebook/src/book/bookTreeItem.ts @@ -59,7 +59,7 @@ export class BookTreeItem extends vscode.TreeItem { if (book.isUntitled) { this.contextValue = 'unsavedNotebook'; } else { - this.contextValue = 'savedNotebook'; + this.contextValue = isBookItemPinned(book.contentPath) ? 'pinnedNotebook' : 'savedNotebook'; } } else { this.contextValue = book.type === BookTreeItemType.Notebook ? (isBookItemPinned(book.contentPath) ? 'pinnedNotebook' : 'savedNotebook') : 'section'; diff --git a/extensions/notebook/src/common/appContext.ts b/extensions/notebook/src/common/appContext.ts index 83b42630b5..56181cc1dc 100644 --- a/extensions/notebook/src/common/appContext.ts +++ b/extensions/notebook/src/common/appContext.ts @@ -25,7 +25,7 @@ export class AppContext { let workspaceFolders = vscode.workspace.workspaceFolders?.slice() ?? []; this.bookTreeViewProvider = new BookTreeViewProvider(workspaceFolders, extensionContext, false, BOOKS_VIEWID, NavigationProviders.NotebooksNavigator); this.providedBookTreeViewProvider = new BookTreeViewProvider([], extensionContext, true, PROVIDED_BOOKS_VIEWID, NavigationProviders.ProvidedBooksNavigator); - this.pinnedBookTreeViewProvider = new BookTreeViewProvider([], extensionContext, false, PINNED_BOOKS_VIEWID, NavigationProviders.NotebooksNavigator); + this.pinnedBookTreeViewProvider = new BookTreeViewProvider([], extensionContext, false, PINNED_BOOKS_VIEWID, NavigationProviders.PinnedNotebooksNavigator); this.outputChannel = vscode.window.createOutputChannel(extensionOutputChannelName); } } diff --git a/extensions/notebook/src/common/constants.ts b/extensions/notebook/src/common/constants.ts index 1f382e2e25..baf9b2340d 100644 --- a/extensions/notebook/src/common/constants.ts +++ b/extensions/notebook/src/common/constants.ts @@ -69,7 +69,8 @@ export enum PythonPkgType { export enum NavigationProviders { NotebooksNavigator = 'BookNavigator.Notebooks', - ProvidedBooksNavigator = 'BookNavigator.ProvidedBooks' + ProvidedBooksNavigator = 'BookNavigator.ProvidedBooks', + PinnedNotebooksNavigator = 'BookNavigator.PinnedNotebooks' } export const unsavedBooksContextKey = 'unsavedBooks';