Fixes working tree compare cmds on result files

eamodio · eamodio · commit 9acfad55b275 · 2025-03-09T18:28:29.000-04:00
diff --git a/contributions.json b/contributions.json
@@ -7837,7 +7837,7 @@
 					{
 						"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+conflicted\\b)/",
 						"group": "1_gitlens",
-						"order": 2
+						"order": 1
 					}
 				],
 				"view/item/context": [
@@ -8058,7 +8058,7 @@
 					{
 						"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+(conflicted|stashed|staged|unstaged)\\b)/",
 						"group": "1_gitlens",
-						"order": 1
+						"order": 2
 					}
 				]
 			}
diff --git a/package.json b/package.json
@@ -13792,13 +13792,13 @@
 			],
 			"gitlens/commit/file/changes": [
 				{
-					"command": "gitlens.views.openPreviousChangesWithWorking",
-					"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+(conflicted|stashed|staged|unstaged)\\b)/",
+					"command": "gitlens.views.openChangesWithWorking",
+					"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+conflicted\\b)/",
 					"group": "1_gitlens@1"
 				},
 				{
-					"command": "gitlens.views.openChangesWithWorking",
-					"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+conflicted\\b)/",
+					"command": "gitlens.views.openPreviousChangesWithWorking",
+					"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+(conflicted|stashed|staged|unstaged)\\b)/",
 					"group": "1_gitlens@2"
 				},
 				{
diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts
@@ -1575,7 +1575,7 @@ export class ViewCommands implements Disposable {
 
 		return CommitActions.openChangesWithWorking(node.file, {
 			repoPath: node.repoPath,
-			ref: node.is('results-file') ? node.ref2 : node.ref.ref,
+			ref: node.is('results-file') && node.ref2 !== '' ? node.ref2 : node.ref.ref,
 		});
 	}
 
@@ -1585,7 +1585,7 @@ export class ViewCommands implements Disposable {
 
 		return CommitActions.openChangesWithWorking(node.file, {
 			repoPath: node.repoPath,
-			ref: node.is('results-file') ? node.ref1 : `${node.ref.ref}^`,
+			ref: node.is('results-file') && node.ref2 !== '' ? node.ref1 : `${node.ref.ref}^`,
 		});
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -7837,7 +7837,7 @@`
`7837`	`7837`	`{`
`7838`	`7838`	`"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+conflicted\\b)/",`
`7839`	`7839`	`"group": "1_gitlens",`
`7840`		`- "order": 2`
	`7840`	`+ "order": 1`
`7841`	`7841`	`}`
`7842`	`7842`	`],`
`7843`	`7843`	`"view/item/context": [`
`@@ -8058,7 +8058,7 @@`
`8058`	`8058`	`{`
`8059`	`8059`	`"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+(conflicted\|stashed\|staged\|unstaged)\\b)/",`
`8060`	`8060`	`"group": "1_gitlens",`
`8061`		`- "order": 1`
	`8061`	`+ "order": 2`
`8062`	`8062`	`}`
`8063`	`8063`	`]`
`8064`	`8064`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13792,13 +13792,13 @@`
`13792`	`13792`	`],`
`13793`	`13793`	`"gitlens/commit/file/changes": [`
`13794`	`13794`	`{`
`13795`		`- "command": "gitlens.views.openPreviousChangesWithWorking",`
`13796`		`- "when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+(conflicted\|stashed\|staged\|unstaged)\\b)/",`
	`13795`	`+ "command": "gitlens.views.openChangesWithWorking",`
	`13796`	`+ "when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+conflicted\\b)/",`
`13797`	`13797`	`"group": "1_gitlens@1"`
`13798`	`13798`	`},`
`13799`	`13799`	`{`
`13800`		`- "command": "gitlens.views.openChangesWithWorking",`
`13801`		`- "when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+conflicted\\b)/",`
	`13800`	`+ "command": "gitlens.views.openPreviousChangesWithWorking",`
	`13801`	`+ "when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+(conflicted\|stashed\|staged\|unstaged)\\b)/",`
`13802`	`13802`	`"group": "1_gitlens@2"`
`13803`	`13803`	`},`
`13804`	`13804`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1575,7 +1575,7 @@ export class ViewCommands implements Disposable {`
`1575`	`1575`
`1576`	`1576`	`return CommitActions.openChangesWithWorking(node.file, {`
`1577`	`1577`	`repoPath: node.repoPath,`
`1578`		`- ref: node.is('results-file') ? node.ref2 : node.ref.ref,`
	`1578`	`+ ref: node.is('results-file') && node.ref2 !== '' ? node.ref2 : node.ref.ref,`
`1579`	`1579`	`});`
`1580`	`1580`	`}`
`1581`	`1581`
`@@ -1585,7 +1585,7 @@ export class ViewCommands implements Disposable {`
`1585`	`1585`
`1586`	`1586`	`return CommitActions.openChangesWithWorking(node.file, {`
`1587`	`1587`	`repoPath: node.repoPath,`
`1588`		- ref: node.is('results-file') ? node.ref1 : `${node.ref.ref}^`,
	`1588`	+ ref: node.is('results-file') && node.ref2 !== '' ? node.ref1 : `${node.ref.ref}^`,
`1589`	`1589`	`});`
`1590`	`1590`	`}`
`1591`	`1591`