Closes #3053 adds open in integrated terminal

Adds terminal & integrated terminal to upstream status
gitkraken · Dec 12, 2023 · cd475ef · cd475ef
1 parent 971f1fa
commit cd475ef
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
   - Requires VS Code `1.85` or later and `multiDiffEditor.experimental.enabled` to be enabled
 - Adds a confirmation prompt when attempting to undo a commit with uncommitted changes
 - Adds a _[Show|Hide] Merge Commits_ toggle to the _Contributors_ view
+- Adds _Open in Integrated Terminal_ command to repositories in the views &mdash; closes [#3053](https://github.com/gitkraken/vscode-gitlens/issues/3053)
+- Adds _Open in Terminal_ & _Open in Integrated Terminal_ commands to the upstream status in the _Commits_ view
 
 ### Changed
 

diff --git a/package.json b/package.json
@@ -6365,6 +6365,11 @@
 				"title": "Open in Terminal",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.views.openInIntegratedTerminal",
+				"title": "Open in Integrated Terminal",
+				"category": "GitLens"
+			},
 			{
 				"command": "gitlens.views.setAsDefault",
 				"title": "Set as Default",
@@ -9512,6 +9517,10 @@
 					"command": "gitlens.views.openInTerminal",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.openInIntegratedTerminal",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.setAsDefault",
 					"when": "false"
@@ -13100,15 +13109,20 @@
 					"group": "2_gitlens_quickopen@1"
 				},
 				{
-					"command": "gitlens.openRepoOnRemote",
-					"when": "viewItem =~ /gitlens:repository\\b/ && gitlens:hasRemotes",
-					"group": "2_gitlens_quickopen@2",
-					"alt": "gitlens.copyRemoteRepositoryUrl"
+					"command": "gitlens.views.openInIntegratedTerminal",
+					"when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/",
+					"group": "2_gitlens_quickopen@2"
 				},
 				{
 					"command": "gitlens.views.revealRepositoryInExplorer",
 					"when": "viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace\\b)/",
-					"group": "2_gitlens_quickopen@2"
+					"group": "2_gitlens_quickopen@3"
+				},
+				{
+					"command": "gitlens.openRepoOnRemote",
+					"when": "viewItem =~ /gitlens:repository\\b/ && gitlens:hasRemotes",
+					"group": "2_gitlens_quickopen@4",
+					"alt": "gitlens.copyRemoteRepositoryUrl"
 				},
 				{
 					"command": "gitlens.showCommitSearch",
@@ -13201,10 +13215,15 @@
 					"when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:repo-folder\\b/",
 					"group": "2_gitlens_quickopen@1"
 				},
+				{
+					"command": "gitlens.views.openInIntegratedTerminal",
+					"when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:repo-folder\\b/",
+					"group": "2_gitlens_quickopen@2"
+				},
 				{
 					"command": "gitlens.openRepoOnRemote",
 					"when": "viewItem =~ /gitlens:repo-folder\\b/ && gitlens:hasRemotes",
-					"group": "2_gitlens_quickopen@2",
+					"group": "2_gitlens_quickopen@3",
 					"alt": "gitlens.copyRemoteRepositoryUrl"
 				},
 				{
@@ -13329,10 +13348,20 @@
 					"when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:action:createPullRequest && viewItem =~ /gitlens:status:upstream:(?!(missing|none))/",
 					"group": "1_gitlens_secondary_actions@3"
 				},
+				{
+					"command": "gitlens.views.openInTerminal",
+					"when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:status:upstream\\b/",
+					"group": "2_gitlens_quickopen@1"
+				},
+				{
+					"command": "gitlens.views.openInIntegratedTerminal",
+					"when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:status:upstream\\b/",
+					"group": "2_gitlens_quickopen@2"
+				},
 				{
 					"command": "gitlens.openBranchOnRemote",
-					"when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:status:upstream:(?!(missing|none))/",
-					"group": "2_gitlens_quickopen@1",
+					"when": "gitlens:hasRemotes && viewItem =~ /gitlens:status:upstream:(?!(missing|none))/",
+					"group": "2_gitlens_quickopen@3",
 					"alt": "gitlens.copyRemoteBranchUrl"
 				},
 				{

diff --git a/src/constants.ts b/src/constants.ts
@@ -637,6 +637,7 @@ export type CoreCommands =
 	| 'editor.action.webvieweditor.showFind'
 	| 'editorScroll'
 	| 'list.collapseAllToFocus'
+	| 'openInIntegratedTerminal'
 	| 'openInTerminal'
 	| 'revealFileInOS'
 	| 'revealInExplorer'

diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts
@@ -187,6 +187,7 @@ export class ViewCommands {
 		registerViewCommand('gitlens.views.unsetAsDefault', this.unsetAsDefault, this);
 
 		registerViewCommand('gitlens.views.openInTerminal', this.openInTerminal, this);
+		registerViewCommand('gitlens.views.openInIntegratedTerminal', this.openInIntegratedTerminal, this);
 		registerViewCommand('gitlens.views.star', this.star, this);
 		registerViewCommand('gitlens.views.unstar', this.unstar, this);
 
@@ -576,10 +577,17 @@ export class ViewCommands {
 	}
 
 	@log()
-	private openInTerminal(node: RepositoryNode | RepositoryFolderNode) {
-		if (!node.isAny('repository', 'repo-folder')) return Promise.resolve();
+	private openInTerminal(node: BranchTrackingStatusNode | RepositoryNode | RepositoryFolderNode) {
+		if (!node.isAny('tracking-status', 'repository', 'repo-folder')) return Promise.resolve();
 
-		return executeCoreCommand('openInTerminal', Uri.file(node.repo.path));
+		return executeCoreCommand('openInTerminal', Uri.file(node.repoPath));
+	}
+
+	@log()
+	private openInIntegratedTerminal(node: BranchTrackingStatusNode | RepositoryNode | RepositoryFolderNode) {
+		if (!node.isAny('tracking-status', 'repository', 'repo-folder')) return Promise.resolve();
+
+		return executeCoreCommand('openInIntegratedTerminal', Uri.file(node.repoPath));
 	}
 
 	@log()