|
1 | 1 | import { |
2 | 2 | Disposable, |
3 | 3 | EventEmitter, |
4 | | - TextEditor, |
5 | 4 | Uri, |
6 | 5 | WorkspaceFolder, |
7 | 6 | window, |
@@ -61,26 +60,39 @@ export class WorkspaceFolderManager implements Disposable { |
61 | 60 | } |
62 | 61 | } |
63 | 62 | }), |
64 | | - window.onDidChangeActiveTextEditor((editor) => { |
65 | | - this.setIsActiveFileInActiveProject(editor); |
| 63 | + window.onDidChangeActiveTextEditor(() => { |
| 64 | + this.setIsActiveFileInActiveProject(); |
| 65 | + }), |
| 66 | + window.onDidChangeActiveNotebookEditor(() => { |
| 67 | + this.setIsActiveFileInActiveProject(); |
66 | 68 | }), |
67 | 69 | this.onDidChangeActiveProjectFolder(() => { |
68 | | - this.setIsActiveFileInActiveProject(window.activeTextEditor); |
| 70 | + this.setIsActiveFileInActiveProject(); |
69 | 71 | }) |
70 | 72 | ); |
71 | 73 |
|
72 | | - this.setIsActiveFileInActiveProject(window.activeTextEditor); |
| 74 | + this.setIsActiveFileInActiveProject(); |
73 | 75 | } |
74 | 76 |
|
75 | | - private setIsActiveFileInActiveProject(activeEditor?: TextEditor) { |
| 77 | + private setIsActiveFileInActiveProject() { |
| 78 | + if (this.activeProjectUri === undefined) { |
| 79 | + this.customWhenContext.setIsActiveFileInActiveWorkspace(false); |
| 80 | + return; |
| 81 | + } |
| 82 | + const activeEditor = window.activeTextEditor; |
76 | 83 | const isActiveFileInActiveWorkspace = |
77 | | - this.activeProjectUri !== undefined && |
78 | 84 | activeEditor !== undefined && |
79 | 85 | activeEditor.document.uri.fsPath.startsWith( |
| 86 | + this.activeProjectUri.fsPath |
| 87 | + ); |
| 88 | + const activeNotebookEditor = window.activeNotebookEditor; |
| 89 | + const isActiveNotebookInActiveWorkspace = |
| 90 | + activeNotebookEditor !== undefined && |
| 91 | + activeNotebookEditor.notebook.uri.fsPath.startsWith( |
80 | 92 | this.activeProjectUri?.fsPath |
81 | 93 | ); |
82 | 94 | this.customWhenContext.setIsActiveFileInActiveWorkspace( |
83 | | - isActiveFileInActiveWorkspace |
| 95 | + isActiveFileInActiveWorkspace || isActiveNotebookInActiveWorkspace |
84 | 96 | ); |
85 | 97 | } |
86 | 98 |
|
|
0 commit comments