Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark as viewed close file option #4081

Merged
merged 1 commit into from
Oct 19, 2022
Merged

Mark as viewed close file option #4081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,11 +946,30 @@ export function registerCommands(
);

context.subscriptions.push(
vscode.commands.registerCommand('pr.markFileAsViewed', async (treeNode: FileChangeNode | vscode.Uri) => {
vscode.commands.registerCommand('pr.markFileAsViewed', async (treeNode: FileChangeNode | vscode.Uri | undefined) => {
try {
if (treeNode === undefined) {
// Use the active editor to enable keybindings
treeNode = vscode.window.activeTextEditor?.document.uri;
}

if (treeNode instanceof FileChangeNode) {
await treeNode.markFileAsViewed();
} else {
} else if (treeNode) {
// When the argument is a uri it came from the editor menu and we should also close the file
// Do the close first to improve perceived performance of marking as viewed.
const tab = vscode.window.tabGroups.activeTabGroup.activeTab;
if (tab) {
let compareUri: vscode.Uri | undefined = undefined;
if (tab.input instanceof vscode.TabInputTextDiff) {
compareUri = tab.input.modified;
} else if (tab.input instanceof vscode.TabInputText) {
compareUri = tab.input.uri;
}
if (compareUri && treeNode.toString() === compareUri.toString()) {
vscode.window.tabGroups.close(tab);
}
}
const manager = reposManager.getManagerForFile(treeNode);
await manager?.activePullRequest?.markFileAsViewed(treeNode.path);
manager?.activePullRequest?.setFileViewedContext();
Expand All @@ -962,11 +981,16 @@ export function registerCommands(
);

context.subscriptions.push(
vscode.commands.registerCommand('pr.unmarkFileAsViewed', async (treeNode: FileChangeNode | vscode.Uri) => {
vscode.commands.registerCommand('pr.unmarkFileAsViewed', async (treeNode: FileChangeNode | vscode.Uri | undefined) => {
try {
if (treeNode === undefined) {
// Use the active editor to enable keybindings
treeNode = vscode.window.activeTextEditor?.document.uri;
}

if (treeNode instanceof FileChangeNode) {
treeNode.unmarkFileAsViewed();
} else {
} else if (treeNode) {
const manager = reposManager.getManagerForFile(treeNode);
await manager?.activePullRequest?.unmarkFileAsViewed(treeNode.path);
manager?.activePullRequest?.setFileViewedContext();
Expand Down