-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Fixes #1651 - Adds an option to open a file on click in Search & Compare #3583
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.
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
base: main
Are you sure you want to change the base?
Conversation
48b5b7d
to
0948fd6
Compare
@eamodio Merged main into this branch, ready for review 🙏 |
return createCommand<[CommitFileNodeBase<Type, TView>, OpenFileAtRevisionCommandArgs]>( | ||
'gitlens.views.openFileRevision', | ||
'Open File at Revision', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This relies on reusing the logic from the context menu item "Open File at Revision". The alternative is to use the generic command gitlens.openFileRevision
and copy the logic to get the revision URI:
const revisionUri =
node.commit.file?.status === 'D'
? this.container.git
.getRepositoryService(node.commit.repoPath)
.getRevisionUri(
(await node.commit.getPreviousSha()) ?? deletedOrMissing,
node.commit.file.path,
)
: this.container.git.getRevisionUriFromGitUri(node.uri);
However this would require making this method async
which wouldn't work :/
const filesConfig = this.view.config.files; | ||
if ('openDiffOnClick' in filesConfig && filesConfig.openDiffOnClick === false) { | ||
return createCommand<[CommitFileNodeBase<Type, TView>, OpenFileAtRevisionCommandArgs]>( | ||
'gitlens.views.openFileRevision', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this open the file at the revision or open current file? The context menu item has both "Open File" and "Open File at Revision" and same for the icons, though clicking the icon without [Alt] would open the file at the revision so I opted to make that the default for a single click
Description
Closes #1651. This PR adds an option in the GitLens settings to open the file when clicking on its entry in the Search & Compare instead of opening the diff view.
Since this issue was only for the Search & Compare, I only added this settings for this view. If there is need to add it to the other views then I can do that as well. Supersedes #2845 since that one seems to be stale now.
Checklist
Fixes $XXX -
orCloses #XXX -
prefix to auto-close the issue that your PR addresses