Skip to content

Commit 9c9877b

Browse files
alexdimaalexdima
authored
Merge branch 'master' into aeschli/sortExtByPrimaryLanguage
2 parents 4fcd9c3 + a5aa8f5 commit 9c9877b

479 files changed

Lines changed: 12490 additions & 6087 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.

‎.eslintrc.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,18 @@
725725
"*" // node modules
726726
]
727727
},
728+
{
729+
"target": "**/vs/code/browser/**",
730+
"restrictions": [
731+
"vs/nls",
732+
"vs/css!./**/*",
733+
"**/vs/base/**/{common,browser}/**",
734+
"**/vs/base/parts/**/{common,browser}/**",
735+
"**/vs/platform/**/{common,browser}/**",
736+
"**/vs/code/**/{common,browser}/**",
737+
"**/vs/workbench/workbench.web.api"
738+
]
739+
},
728740
{
729741
"target": "**/vs/code/node/**",
730742
"restrictions": [
@@ -795,6 +807,18 @@
795807
"**/vs/workbench/workbench.common.main"
796808
]
797809
},
810+
{
811+
"target": "**/src/vs/workbench/workbench.web.api.ts",
812+
"restrictions": [
813+
"vs/nls",
814+
"**/vs/base/**/{common,browser}/**",
815+
"**/vs/base/parts/**/{common,browser}/**",
816+
"**/vs/platform/**/{common,browser}/**",
817+
"**/vs/editor/**",
818+
"**/vs/workbench/**/{common,browser}/**",
819+
"**/vs/workbench/workbench.web.main"
820+
]
821+
},
798822
{
799823
"target": "**/src/vs/workbench/workbench.sandbox.main.ts",
800824
"restrictions": [

‎.github/commands.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,18 @@
351351
"addLabel": "*caused-by-extension",
352352
"comment": "It looks like this is caused by the Java Debugger extension. Please file it with the repository [here](https://github.com/Microsoft/vscode-java-debug). 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!"
353353
},
354+
{
355+
"type": "comment",
356+
"name": "gifPlease",
357+
"allowUsers": [
358+
"cleidigh",
359+
"usernamehw",
360+
"gjsjohnmurray",
361+
"IllusionMH"
362+
],
363+
"action": "comment",
364+
"comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette).\n\nHappy coding!"
365+
},
354366
{
355367
"type": "comment",
356368
"name": "label",

‎.github/workflows/feature-request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
featureRequestLabel: feature-request
3535
upvotesRequired: 20
3636
numCommentsOverride: 20
37-
initComment: "This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
38-
warnComment: "This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding"
37+
initComment: "This feature request is now a candidate for our backlog. The community has 60 days to [upvote](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
38+
warnComment: "This feature request has not yet received the 20 community [upvotes](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding"
3939
acceptComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
4040
rejectComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
4141
warnDays: 10

‎.vscode/extensions.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"recommendations": [
55
"dbaeumer.vscode-eslint",
66
"EditorConfig.EditorConfig",
7-
"msjsdiag.debugger-for-chrome",
8-
"ms-vscode.vscode-github-issue-notebooks"
7+
"msjsdiag.debugger-for-chrome"
98
]
109
}

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
"name": "Markdown Extension Tests",
320320
"runtimeExecutable": "${execPath}",
321321
"args": [
322-
"${workspaceFolder}/extensions/markdown-language-features/test-fixtures",
322+
"${workspaceFolder}/extensions/markdown-language-features/test-workspace",
323323
"--extensionDevelopmentPath=${workspaceFolder}/extensions/markdown-language-features",
324324
"--extensionTestsPath=${workspaceFolder}/extensions/markdown-language-features/out/test"
325325
],

‎.vscode/notebooks/api.github-issues‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
[
2+
{
3+
"kind": 1,
4+
"language": "markdown",
5+
"value": "#### Config",
6+
"editable": true
7+
},
8+
{
9+
"kind": 2,
10+
"language": "github-issues",
11+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"July 2020\"",
12+
"editable": true
13+
},
14+
{
15+
"kind": 1,
16+
"language": "markdown",
17+
"value": "### Finalization",
18+
"editable": true
19+
},
20+
{
21+
"kind": 2,
22+
"language": "github-issues",
23+
"value": "$repo $milestone label:api-finalization",
24+
"editable": true
25+
},
26+
{
27+
"kind": 1,
28+
"language": "markdown",
29+
"value": "### Proposals",
30+
"editable": true
31+
},
32+
{
33+
"kind": 2,
34+
"language": "github-issues",
35+
"value": "$repo $milestone is:open label:api-proposal ",
36+
"editable": true
37+
}
38+
]

‎.vscode/searches/es6.code-search‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Flags: CaseSensitive WordMatch
33
# ContextLines: 2
44

5-
16 results - 5 files
5+
14 results - 4 files
66

77
src/vs/base/browser/dom.ts:
88
81 };
@@ -34,24 +34,11 @@ src/vs/base/common/arrays.ts:
3434
420 */
3535
421 export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
3636

37-
560
38-
561 /**
39-
562: * @deprecated ES6: use `Array.find`
40-
563 */
41-
564 export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
42-
43-
src/vs/base/common/map.ts:
44-
11
45-
12 /**
46-
13: * @deprecated ES6: use `[...SetOrMap.values()]`
47-
14 */
48-
15 export function values<V = any>(set: Set<V>): V[];
49-
50-
22
51-
23 /**
52-
24: * @deprecated ES6: use `[...map.keys()]`
53-
25 */
54-
26 export function keys<K, V>(map: Map<K, V>): K[] {
37+
569
38+
570 /**
39+
571: * @deprecated ES6: use `Array.find`
40+
572 */
41+
573 export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
5542

5643
src/vs/base/common/objects.ts:
5744
115

‎.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 "8.3.3"
2+
target "9.1.0"
33
runtime "electron"

‎build/azure-pipelines/darwin/continuous-build-darwin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "12.13.0"
4+
versionSpec: "12.14.1"
55

66
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
77
inputs:

‎build/azure-pipelines/darwin/product-build-darwin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121

2222
- task: NodeTool@0
2323
inputs:
24-
versionSpec: "12.13.0"
24+
versionSpec: "12.14.1"
2525

2626
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
2727
inputs:

0 commit comments

Comments
 (0)