Skip to content

Commit 5717a3f

Browse files
committed
Merge branch 'main' into copilot/add-pr-title-from-branch-name
2 parents c6e471a + 0bed968 commit 5717a3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1853
-959
lines changed

package.json

Lines changed: 89 additions & 7 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"
@@ -245,7 +245,7 @@
245245
"default": [
246246
{
247247
"label": "%githubPullRequests.queries.copilotOnMyBehalf%",
248-
"query": "repo:${owner}/${repository} is:open author:copilot involves:${user}"
248+
"query": "repo:${owner}/${repository} is:open author:copilot assignee:${user}"
249249
},
250250
{
251251
"label": "Local Pull Request Branches",
@@ -323,6 +323,11 @@
323323
"default": true,
324324
"description": "%githubPullRequests.defaultDeletionMethod.selectRemote.description%"
325325
},
326+
"githubPullRequests.deleteBranchAfterMerge": {
327+
"type": "boolean",
328+
"default": false,
329+
"description": "%githubPullRequests.deleteBranchAfterMerge.description%"
330+
},
326331
"githubPullRequests.terminalLinksHandler": {
327332
"type": "string",
328333
"enum": [
@@ -614,6 +619,11 @@
614619
"markdownDescription": "%githubPullRequests.webviewRefreshInterval.description%",
615620
"default": 60
616621
},
622+
"githubPullRequests.devMode": {
623+
"type": "boolean",
624+
"markdownDescription": "%githubPullRequests.devMode.description%",
625+
"default": false
626+
},
617627
"githubIssues.ignoreMilestones": {
618628
"type": "array",
619629
"default": [],
@@ -713,6 +723,21 @@
713723
"default": "on",
714724
"markdownDescription": "%githubIssues.useBranchForIssues.markdownDescription%"
715725
},
726+
"githubIssues.workingBaseBranch": {
727+
"type": "string",
728+
"enum": [
729+
"currentBranch",
730+
"defaultBranch",
731+
"prompt"
732+
],
733+
"enumDescriptions": [
734+
"%githubIssues.workingBaseBranch.currentBranch%",
735+
"%githubIssues.workingBaseBranch.defaultBranch%",
736+
"%githubIssues.workingBaseBranch.prompt%"
737+
],
738+
"default": "currentBranch",
739+
"markdownDescription": "%githubIssues.workingBaseBranch.markdownDescription%"
740+
},
716741
"githubIssues.issueCompletionFormatScm": {
717742
"type": "string",
718743
"default": "${issueTitle}\nFixes ${issueNumberLabel}",
@@ -973,6 +998,12 @@
973998
"category": "%command.pull.request.category%",
974999
"icon": "$(globe)"
9751000
},
1001+
{
1002+
"command": "pr.pickOnCodespaces",
1003+
"title": "%command.pr.pickOnCodespaces.title%",
1004+
"category": "%command.pull.request.category%",
1005+
"icon": "$(cloud)"
1006+
},
9761007
{
9771008
"command": "pr.exit",
9781009
"title": "%command.pr.exit.title%",
@@ -1035,6 +1066,11 @@
10351066
"title": "%command.pr.openFileOnGitHub.title%",
10361067
"category": "%command.pull.request.category%"
10371068
},
1069+
{
1070+
"command": "pr.revealFileInOS",
1071+
"title": "%command.pr.revealFileInOS.title%",
1072+
"category": "%command.pull.request.category%"
1073+
},
10381074
{
10391075
"command": "pr.copyCommitHash",
10401076
"title": "%command.pr.copyCommitHash.title%",
@@ -1419,6 +1455,11 @@
14191455
"title": "%command.pr.checkoutOnVscodeDevFromDescription.title%",
14201456
"category": "%command.pull.request.category%"
14211457
},
1458+
{
1459+
"command": "pr.checkoutOnCodespacesFromDescription",
1460+
"title": "%command.pr.checkoutOnCodespacesFromDescription.title%",
1461+
"category": "%command.pull.request.category%"
1462+
},
14221463
{
14231464
"command": "pr.openSessionLogFromDescription",
14241465
"title": "%command.pr.openSessionLogFromDescription.title%",
@@ -2016,6 +2057,12 @@
20162057
"mac": "cmd+k m",
20172058
"command": "pr.makeSuggestion",
20182059
"when": "commentEditorFocused"
2060+
},
2061+
{
2062+
"key": "ctrl+r",
2063+
"mac": "cmd+r",
2064+
"command": "pr.refreshDescription",
2065+
"when": "activeWebviewPanelId == 'PullRequestOverview'"
20192066
}
20202067
],
20212068
"menus": {
@@ -2052,6 +2099,10 @@
20522099
"command": "pr.pickOnVscodeDev",
20532100
"when": "false"
20542101
},
2102+
{
2103+
"command": "pr.pickOnCodespaces",
2104+
"when": "false"
2105+
},
20552106
{
20562107
"command": "pr.exit",
20572108
"when": "github:inReviewMode"
@@ -2120,6 +2171,10 @@
21202171
"command": "pr.openFileOnGitHub",
21212172
"when": "false"
21222173
},
2174+
{
2175+
"command": "pr.revealFileInOS",
2176+
"when": "false"
2177+
},
21232178
{
21242179
"command": "pr.openOriginalFile",
21252180
"when": "false"
@@ -2851,6 +2906,11 @@
28512906
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:nonactive/ && (!isWeb || remoteName != codespaces && virtualWorkspace != vscode-vfs)",
28522907
"group": "1_pullrequest@2"
28532908
},
2909+
{
2910+
"command": "pr.pickOnCodespaces",
2911+
"when": "view == pr:github && viewItem =~ /pullrequest(:local)?:nonactive/ && (!isWeb || remoteName != codespaces && virtualWorkspace != vscode-vfs)",
2912+
"group": "1_pullrequest@3"
2913+
},
28542914
{
28552915
"command": "pr.openChanges",
28562916
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /(pullrequest|description)/ && config.multiDiffEditor.experimental.enabled",
@@ -2965,15 +3025,20 @@
29653025
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange/",
29663026
"group": "0_open@0"
29673027
},
3028+
{
3029+
"command": "pr.revealFileInOS",
3030+
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange(?!:ADD)/",
3031+
"group": "0_open@1"
3032+
},
29683033
{
29693034
"command": "pr.openOriginalFile",
29703035
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange:MODIFY/",
2971-
"group": "0_open@1"
3036+
"group": "0_open@2"
29723037
},
29733038
{
29743039
"command": "pr.openModifiedFile",
29753040
"when": "view =~ /(pr|prStatus):github/ && viewItem =~ /filechange:MODIFY/",
2976-
"group": "0_open@2"
3041+
"group": "0_open@3"
29773042
},
29783043
{
29793044
"command": "review.diffWithPrHead",
@@ -3604,6 +3669,11 @@
36043669
"group": "checkout@1",
36053670
"when": "webviewId == PullRequestOverview && github:checkoutMenu"
36063671
},
3672+
{
3673+
"command": "pr.checkoutOnCodespacesFromDescription",
3674+
"group": "checkout@2",
3675+
"when": "webviewId == PullRequestOverview && github:checkoutMenu"
3676+
},
36073677
{
36083678
"command": "pr.openSessionLogFromDescription",
36093679
"when": "webviewId == PullRequestOverview && github:codingAgentMenu"
@@ -3634,11 +3704,11 @@
36343704
"chat/multiDiff/context": [
36353705
{
36363706
"command": "pr.checkoutFromDescription",
3637-
"when": "chatSessionType == copilot-cloud-agent"
3707+
"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0"
36383708
},
36393709
{
36403710
"command": "pr.applyChangesFromDescription",
3641-
"when": "chatSessionType == copilot-cloud-agent"
3711+
"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0"
36423712
}
36433713
]
36443714
},
@@ -3673,6 +3743,16 @@
36733743
},
36743744
"description": "The color used for indicating that an issue is closed."
36753745
},
3746+
{
3747+
"id": "github.issues.closed",
3748+
"defaults": {
3749+
"dark": "pullRequests.merged",
3750+
"light": "pullRequests.merged",
3751+
"highContrast": "editor.foreground",
3752+
"highContrastLight": "editor.foreground"
3753+
},
3754+
"description": "The color used for indicating that an issue is closed. Duplicates issues.closed because there's another extension that uses this identifier."
3755+
},
36763756
{
36773757
"id": "pullRequests.merged",
36783758
"defaults": {
@@ -4353,6 +4433,7 @@
43534433
"@shikijs/monaco": "^3.7.0",
43544434
"@types/chai": "^4.1.4",
43554435
"@types/glob": "7.1.3",
4436+
"@types/js-yaml": "^4.0.9",
43564437
"@types/lru-cache": "^5.1.0",
43574438
"@types/marked": "^0.7.2",
43584439
"@types/mocha": "^8.2.2",
@@ -4434,6 +4515,7 @@
44344515
"debounce": "^1.2.1",
44354516
"events": "3.2.0",
44364517
"fast-deep-equal": "^3.1.3",
4518+
"js-yaml": "^4.1.1",
44374519
"jsonc-parser": "^3.3.1",
44384520
"jszip": "^3.10.1",
44394521
"lru-cache": "6.0.0",
@@ -4454,4 +4536,4 @@
44544536
"string_decoder": "^1.3.0"
44554537
},
44564538
"license": "MIT"
4457-
}
4539+
}

0 commit comments

Comments
 (0)