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

Fix decorations for modified notebooks in Books View (#14152)

Browse Source 
* Tree item resource uri should be the root when it's a book and notebook path for notebooks
This commit is contained in:
Barbara Valdez
2021-02-03 18:17:08 -08:00
committed by GitHub
parent 3a89731036
commit cce8a961ac
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/notebook/src/book/bookTreeItem.ts
View File

@@ -82,7 +82,7 @@ export class BookTreeItem extends vscode.TreeItem {
} }
this._rootContentPath = getContentPath(this.book.version, this.book.root, ''); this._rootContentPath = getContentPath(this.book.version, this.book.root, '');
this.tooltip = this.book.type === BookTreeItemType.Book ? this._rootContentPath : this.book.contentPath; this.tooltip = this.book.type === BookTreeItemType.Book ? this._rootContentPath : this.book.contentPath;
this.resourceUri = vscode.Uri.file(this.book.root); this.resourceUri = this.book.type === BookTreeItemType.Book ? vscode.Uri.file(this.book.root) : vscode.Uri.file(this.book.contentPath);
} }
} }

2
src/sql/workbench/contrib/notebook/browser/notebookExplorer/notebookExplorerViewlet.ts
View File

@@ -291,7 +291,7 @@ export class NotebookExplorerViewPaneContainer extends ViewPaneContainer {
filesToIncludeFiltered = filesToIncludeFiltered + path.join(folderToSearch.folder.fsPath, '**', '*.md') + ',' + path.join(folderToSearch.folder.fsPath, '**', '*.ipynb') + ','; filesToIncludeFiltered = filesToIncludeFiltered + path.join(folderToSearch.folder.fsPath, '**', '*.md') + ',' + path.join(folderToSearch.folder.fsPath, '**', '*.ipynb') + ',';
} else { } else {
let pattern = {}; let pattern = {};
let rootFolder = URI.file(root.resourceUri.path); let rootFolder = URI.file(path.dirname(root.resourceUri.path));
let pathToNotebook = isString(root.tooltip) ? root.tooltip : root.tooltip.value; let pathToNotebook = isString(root.tooltip) ? root.tooltip : root.tooltip.value;
let baseName = path.join('**', path.basename(pathToNotebook)); let baseName = path.join('**', path.basename(pathToNotebook));
pattern[baseName] = true; pattern[baseName] = true;