Skip to content

Commit 7133e80

Browse files
committed
Merge branch 'main' into copilot/fix-blank-space-query-string
2 parents 7720203 + d5d3789 commit 7133e80

29 files changed

Lines changed: 1461 additions & 921 deletions

package.json

Lines changed: 86 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"treeItemMarkdownLabel",
4141
"treeViewMarkdownMessage"
4242
],
43-
"version": "0.122.0",
43+
"version": "0.124.0",
4444
"publisher": "GitHub",
4545
"engines": {
4646
"vscode": "^1.107.0"
@@ -243,7 +243,7 @@
243243
"default": [
244244
{
245245
"label": "%githubPullRequests.queries.copilotOnMyBehalf%",
246-
"query": "repo:${owner}/${repository} is:open author:copilot involves:${user}"
246+
"query": "repo:${owner}/${repository} is:open author:copilot assignee:${user}"
247247
},
248248
{
249249
"label": "Local Pull Request Branches",
@@ -321,6 +321,11 @@
321321
"default": true,
322322
"description": "%githubPullRequests.defaultDeletionMethod.selectRemote.description%"
323323
},
324+
"githubPullRequests.deleteBranchAfterMerge": {
325+
"type": "boolean",
326+
"default": false,
327+
"description": "%githubPullRequests.deleteBranchAfterMerge.description%"
328+
},
324329
"githubPullRequests.terminalLinksHandler": {
325330
"type": "string",
326331
"enum": [
@@ -612,6 +617,11 @@
612617
"markdownDescription": "%githubPullRequests.webviewRefreshInterval.description%",
613618
"default": 60
614619
},
620+
"githubPullRequests.devMode": {
621+
"type": "boolean",
622+
"markdownDescription": "%githubPullRequests.devMode.description%",
623+
"default": false
624+
},
615625
"githubIssues.ignoreMilestones": {
616626
"type": "array",
617627
"default": [],
@@ -711,6 +721,21 @@
711721
"default": "on",
712722
"markdownDescription": "%githubIssues.useBranchForIssues.markdownDescription%"
713723
},
724+
"githubIssues.workingBaseBranch": {
725+
"type": "string",
726+
"enum": [
727+
"currentBranch",
728+
"defaultBranch",
729+
"prompt"
730+
],
731+
"enumDescriptions": [
732+
"%githubIssues.workingBaseBranch.currentBranch%",
733+
"%githubIssues.workingBaseBranch.defaultBranch%",
734+
"%githubIssues.workingBaseBranch.prompt%"
735+
],
736+
"default": "currentBranch",
737+
"markdownDescription": "%githubIssues.workingBaseBranch.markdownDescription%"
738+
},
714739
"githubIssues.issueCompletionFormatScm": {
715740
"type": "string",
716741
"default": "${issueTitle}\nFixes ${issueNumberLabel}",
@@ -971,6 +996,12 @@
971996
"category": "%command.pull.request.category%",
972997
"icon": "$(globe)"
973998
},
999+
{
1000+
"command": "pr.pickOnCodespaces",
1001+
"title": "%command.pr.pickOnCodespaces.title%",
1002+
"category": "%command.pull.request.category%",
1003+
"icon": "$(cloud)"
1004+
},
9741005
{
9751006
"command": "pr.exit",
9761007
"title": "%command.pr.exit.title%",
@@ -1033,6 +1064,11 @@
10331064
"title": "%command.pr.openFileOnGitHub.title%",
10341065
"category": "%command.pull.request.category%"
10351066
},
1067+
{
1068+
"command": "pr.revealFileInOS",
1069+
"title": "%command.pr.revealFileInOS.title%",
1070+
"category": "%command.pull.request.category%"
1071+
},
10361072
{
10371073
"command": "pr.copyCommitHash",
10381074
"title": "%command.pr.copyCommitHash.title%",
@@ -1417,6 +1453,11 @@
14171453
"title": "%command.pr.checkoutOnVscodeDevFromDescription.title%",
14181454
"category": "%command.pull.request.category%"
14191455
},
1456+
{
1457+
"command": "pr.checkoutOnCodespacesFromDescription",
1458+
"title": "%command.pr.checkoutOnCodespacesFromDescription.title%",
1459+
"category": "%command.pull.request.category%"
1460+
},
14201461
{
14211462
"command": "pr.openSessionLogFromDescription",
14221463
"title": "%command.pr.openSessionLogFromDescription.title%",
@@ -2014,6 +2055,12 @@
20142055
"mac": "cmd+k m",
20152056
"command": "pr.makeSuggestion",
20162057
"when": "commentEditorFocused"
2058+
},
2059+
{
2060+
"key": "ctrl+r",
2061+
"mac": "cmd+r",
2062+
"command": "pr.refreshDescription",
2063+
"when": "activeWebviewPanelId == 'PullRequestOverview'"
20172064
}
20182065
],
20192066
"menus": {
@@ -2050,6 +2097,10 @@
20502097
"command": "pr.pickOnVscodeDev",
20512098
"when": "false"
20522099
},
2100+
{
2101+
"command": "pr.pickOnCodespaces",
2102+
"when": "false"
2103+
},
20532104
{
20542105
"command": "pr.exit",
20552106
"when": "github:inReviewMode"
@@ -2118,6 +2169,10 @@
21182169
"command": "pr.openFileOnGitHub",
21192170
"when": "false"
21202171
},
2172+
{
2173+
"command": "pr.revealFileInOS",
2174+
"when": "false"
2175+
},
21212176
{
21222177
"command": "pr.openOriginalFile",
21232178
"when": "false"
@@ -2849,6 +2904,11 @@
28492904
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:nonactive/ && (!isWeb || remoteName != codespaces && virtualWorkspace != vscode-vfs)",
28502905
"group": "1_pullrequest@2"
28512906
},
2907+
{
2908+
"command": "pr.pickOnCodespaces",
2909+
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:nonactive/ && (!isWeb || remoteName != codespaces && virtualWorkspace != vscode-vfs)",
2910+
"group": "1_pullrequest@3"
2911+
},
28522912
{
28532913
"command": "pr.openChanges",
28542914
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/ && config.multiDiffEditor.experimental.enabled",
@@ -2963,15 +3023,20 @@
29633023
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange/",
29643024
"group": "0_open@0"
29653025
},
3026+
{
3027+
"command": "pr.revealFileInOS",
3028+
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange(?!:ADD)/",
3029+
"group": "0_open@1"
3030+
},
29663031
{
29673032
"command": "pr.openOriginalFile",
29683033
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange:MODIFY/",
2969-
"group": "0_open@1"
3034+
"group": "0_open@2"
29703035
},
29713036
{
29723037
"command": "pr.openModifiedFile",
29733038
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange:MODIFY/",
2974-
"group": "0_open@2"
3039+
"group": "0_open@3"
29753040
},
29763041
{
29773042
"command": "review.diffWithPrHead",
@@ -3602,6 +3667,11 @@
36023667
"group": "checkout@1",
36033668
"when": "webviewId == PullRequestOverview && github:checkoutMenu"
36043669
},
3670+
{
3671+
"command": "pr.checkoutOnCodespacesFromDescription",
3672+
"group": "checkout@2",
3673+
"when": "webviewId == PullRequestOverview && github:checkoutMenu"
3674+
},
36053675
{
36063676
"command": "pr.openSessionLogFromDescription",
36073677
"when": "webviewId == PullRequestOverview && github:codingAgentMenu"
@@ -3632,11 +3702,11 @@
36323702
"chat/multiDiff/context": [
36333703
{
36343704
"command": "pr.checkoutFromDescription",
3635-
"when": "chatSessionType == copilot-cloud-agent"
3705+
"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0"
36363706
},
36373707
{
36383708
"command": "pr.applyChangesFromDescription",
3639-
"when": "chatSessionType == copilot-cloud-agent"
3709+
"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0"
36403710
}
36413711
]
36423712
},
@@ -3671,6 +3741,16 @@
36713741
},
36723742
"description": "The color used for indicating that an issue is closed."
36733743
},
3744+
{
3745+
"id": "github.issues.closed",
3746+
"defaults": {
3747+
"dark": "pullRequests.merged",
3748+
"light": "pullRequests.merged",
3749+
"highContrast": "editor.foreground",
3750+
"highContrastLight": "editor.foreground"
3751+
},
3752+
"description": "The color used for indicating that an issue is closed. Duplicates issues.closed because there's another extension that uses this identifier."
3753+
},
36743754
{
36753755
"id": "pullRequests.merged",
36763756
"defaults": {

0 commit comments

Comments
 (0)