Skip to content

Commit 7b136eb

Browse files
rebornixrebornix
committed
Merge remote-tracking branch 'origin/master' into rebornix/separate-textmodel-selection
2 parents b91c21b + d2f06fb commit 7b136eb

99 files changed

Lines changed: 985 additions & 812 deletions

File tree

Some content is hidden

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

‎.github/commands.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,19 @@
221221
"addLabel": "*caused-by-extension",
222222
"comment": "It looks like this is caused by the C++ extension. Please file it with the repository [here](https://github.com/Microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
223223
},
224+
{
225+
"type": "comment",
226+
"name": "extCpp",
227+
"allowUsers": [
228+
"cleidigh",
229+
"usernamehw",
230+
"gjsjohnmurray",
231+
"IllusionMH"
232+
],
233+
"action": "close",
234+
"addLabel": "*caused-by-extension",
235+
"comment": "It looks like this is caused by the C++ extension. Please file it with the repository [here](https://github.com/Microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
236+
},
224237
{
225238
"type": "comment",
226239
"name": "extTS",

‎.github/workflows/deep-classifier-monitor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
path: ./actions
1616
- name: Install Actions
1717
run: npm install --production --prefix ./actions
18-
- name: "Run Classifier: Scraper"
18+
- name: "Run Classifier: Monitor"
1919
uses: ./actions/classifier-deep/monitor
2020
with:
2121
botName: vscode-triage-bot

‎.github/workflows/deep-classifier-runner.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ jobs:
4545
uses: ./actions/classifier-deep/apply/apply-labels
4646
with:
4747
configPath: classifier
48+
allowLabels: "needs more info|new release"
4849
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
4950
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

‎.github/workflows/on-open.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ jobs:
4848
mustNotMatch: "^We have written the needed data into your clipboard because it was too large to send\\. Please paste\\.$"
4949
comment: "It looks like you're using the VS Code Issue Reporter but did not paste the text generated into the created issue. We've closed this issue, please open a new one containing the text we placed in your clipboard.\n\nHappy Coding!"
5050

51+
- name: Run Clipboard Labeler (Chinese)
52+
uses: ./actions/regex-labeler
53+
with:
54+
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
55+
label: "invalid"
56+
mustNotMatch: "^所需的数据太大，无法直接发送。我们已经将其写入剪贴板，请粘贴。$"
57+
comment: "看起来您正在使用 VS Code 问题报告程序，但是没有将生成的文本粘贴到创建的问题中。我们将关闭这个问题，请使用剪贴板中的内容创建一个新的问题。\n\n祝您使用愉快！"
58+
5159
# source of truth in ./english-please.yml
5260
- name: Run English Please
5361
uses: ./actions/english-please

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "7.3.1"
2+
target "8.3.3"
33
runtime "electron"

‎cgmanifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "chromium",
88
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
9-
"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
9+
"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,32 +40,32 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "78.0.3904.130"
43+
"version": "80.0.3987.165"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "nodejs",
5050
"repositoryUrl": "https://github.com/nodejs/node",
51-
"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
51+
"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
55-
"version": "12.8.1"
55+
"version": "12.13.0"
5656
},
5757
{
5858
"component": {
5959
"type": "git",
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "bc8fc0d406d32e4c02f3ec9f161deaacbe4f5989"
63+
"commitHash": "87fd06bc96bce8f46ca05b8315657fd230bcac85"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "7.3.1"
68+
"version": "8.3.3"
6969
},
7070
{
7171
"component": {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"native-keymap": "2.1.2",
5050
"native-watchdog": "1.3.0",
5151
"node-pty": "0.10.0-beta8",
52-
"semver-umd": "^5.5.6",
52+
"semver-umd": "^5.5.7",
5353
"spdlog": "^0.11.1",
5454
"sudo-prompt": "9.1.1",
5555
"v8-inspect-profiler": "^0.0.20",
@@ -98,7 +98,7 @@
9898
"css-loader": "^3.2.0",
9999
"debounce": "^1.0.0",
100100
"deemon": "^1.4.0",
101-
"electron": "7.3.1",
101+
"electron": "8.3.3",
102102
"eslint": "6.8.0",
103103
"eslint-plugin-jsdoc": "^19.1.0",
104104
"event-stream": "3.3.4",

‎remote/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"minimist": "^1.2.5",
1414
"native-watchdog": "1.3.0",
1515
"node-pty": "0.10.0-beta8",
16-
"semver-umd": "^5.5.6",
16+
"semver-umd": "^5.5.7",
1717
"spdlog": "^0.11.1",
1818
"vscode-nsfw": "1.2.8",
1919
"vscode-oniguruma": "1.3.1",

‎remote/web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-web",
33
"version": "0.0.0",
44
"dependencies": {
5-
"semver-umd": "^5.5.6",
5+
"semver-umd": "^5.5.7",
66
"vscode-oniguruma": "1.3.1",
77
"vscode-textmate": "5.1.1",
88
"xterm": "4.7.0-beta.3",

‎remote/web/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
semver-umd@^5.5.6:
6-
version "5.5.6"
7-
resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.6.tgz#1d185bbd2caec825c564b54907cd09e14083f228"
8-
integrity sha512-6ARYXVi4Y4VO5HfyCjT/6xyykBtJwEXSGQ8ON4UPQSFOjZUDsbAE0J614QcBBsLTTyQMEqvsXN804vAqpydjzw==
5+
semver-umd@^5.5.7:
6+
version "5.5.7"
7+
resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.7.tgz#966beb5e96c7da6fbf09c3da14c2872d6836c528"
8+
integrity sha512-XgjPNlD0J6aIc8xoTN6GQGwWc2Xg0kq8NzrqMVuKG/4Arl6ab1F8+Am5Y/XKKCR+FceFr2yN/Uv5ZJBhRyRqKg==
99

1010
vscode-oniguruma@1.3.1:
1111
version "1.3.1"

0 commit comments

Comments
 (0)