Skip to content

Enable display and monitor of diff hunks inside files #133

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

Open
teddyvallar wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Enable display and monitor of diff hunks inside files #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a019947
add hunks collapse under files
teddyvallar Feb 3, 2026
377912a
add toogle option for diff hunk
teddyvallar Feb 3, 2026
d395435
remove checkbox cache, use only local diff file
teddyvallar Feb 3, 2026
26ff812
use only base commit id in diff file name to keep viewed diff on bran…
teddyvallar Feb 3, 2026
85cbbf7
homemade parser
teddyvallar Feb 8, 2026
0002dec
don't compute hunk when not shown
teddyvallar Feb 8, 2026
1a71479
use openChanges
teddyvallar Feb 9, 2026
ff8d288
keep checkbox state for when diffhunk are disabled
teddyvallar Feb 9, 2026
737b099
fix
teddyvallar Feb 9, 2026
834b121
rename option
teddyvallar Feb 9, 2026
f475c18
delete comment
teddyvallar Feb 9, 2026
b938b1d
Merge branch 'master' into diff-hunks
teddyvallar Feb 9, 2026
41880d0
fix when not enough context available (start or end of file)
teddyvallar Feb 9, 2026
5fcebd2
don't display line x in label when line is empty
teddyvallar Feb 11, 2026
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
33 changes: 29 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,16 @@
"title": "Hide checkboxes",
"category": "Git Tree Compare"
},
{
"command": "gitTreeCompare.showDiffDetails",
"title": "Show hunks",
"category": "Git Tree Compare"
},
{
"command": "gitTreeCompare.hideDiffDetails",
"title": "Hide hunks",
"category": "Git Tree Compare"
},
{
"command": "gitTreeCompare.viewAsList",
"title": "View as List",
Expand Down Expand Up @@ -298,22 +308,32 @@
{
"command": "gitTreeCompare.switchToFullDiff",
"when": "view == gitTreeCompare && config.gitTreeCompare.diffMode == merge",
"group": "3_options"
"group": "3_options@3"
},
{
"command": "gitTreeCompare.switchToMergeDiff",
"when": "view == gitTreeCompare && config.gitTreeCompare.diffMode == full",
"group": "3_options"
"group": "3_options@3"
},
{
"command": "gitTreeCompare.showCheckboxes",
"when": "view == gitTreeCompare && !config.gitTreeCompare.showCheckboxes",
"group": "3_options"
"group": "3_options@1"
},
{
"command": "gitTreeCompare.hideCheckboxes",
"when": "view == gitTreeCompare && config.gitTreeCompare.showCheckboxes",
"group": "3_options"
"group": "3_options@1"
},
{
"command": "gitTreeCompare.showDiffDetails",
"when": "view == gitTreeCompare && !config.gitTreeCompare.showDiffDetails",
"group": "3_options@2"
},
{
"command": "gitTreeCompare.hideDiffDetails",
"when": "view == gitTreeCompare && config.gitTreeCompare.showDiffDetails",
"group": "3_options@2"
},
{
"command": "gitTreeCompare.viewAsList",
Expand Down Expand Up @@ -553,6 +573,11 @@
"description": "Whether to show checkboxes such that files or folders can be ticked off, for example when reviewing.",
"default": false
},
"gitTreeCompare.showDiffDetails": {
"type": "boolean",
"description": "Whether to show diff details (hunks) for each file. When enabled, files can be expanded to view individual changes.",
"default": true
},
"gitTreeCompare.resetCheckboxOnFileChange": {
"type": "boolean",
"description": "When enabled, automatically resets checkboxes when a file is modified after being checked. This ensures that checked files reflect their reviewed state, and any subsequent modifications require re-review.",
Expand Down
9 changes: 8 additions & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ export function activate(context: ExtensionContext) {
commands.registerCommand(NAMESPACE + '.hideCheckboxes', () => {
runAfterInit(() => provider!.hideCheckboxes(true));
});
commands.registerCommand(NAMESPACE + '.showDiffDetails', () => {
runAfterInit(() => provider!.hideDiffDetails(false));
});
commands.registerCommand(NAMESPACE + '.hideDiffDetails', () => {
runAfterInit(() => provider!.hideDiffDetails(true));
});
commands.registerCommand(NAMESPACE + '.viewAsList', () => {
runAfterInit(() => provider!.viewAsTree(false));
});
Expand Down Expand Up @@ -135,7 +141,8 @@ export function activate(context: ExtensionContext) {
commands.executeCommand('setContext', NAMESPACE + '.viewAsList', false);
commands.executeCommand('setContext', NAMESPACE + '.isFiltered', false);

provider = new GitTreeCompareProvider(git, gitApi, outputChannel, context.globalState, context.asAbsolutePath);
const storageUri = context.storageUri || context.globalStorageUri;
provider = new GitTreeCompareProvider(git, gitApi, outputChannel, context.globalState, context.asAbsolutePath, storageUri);

const treeView = window.createTreeView(
NAMESPACE,
Expand Down
Loading