Skip to content

Commit 799c38a

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/main' into alex/update-native-keymap
2 parents 7da76ad + 1466122 commit 799c38a

File tree

795 files changed

+20597
-8310
lines changed

Some content is hidden

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

795 files changed

+20597
-8310
lines changed

‎.eslintrc.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,17 +1071,6 @@
10711071
}
10721072
]
10731073
}
1074-
},
1075-
{
1076-
"files": [
1077-
"src/vs/server/*"
1078-
],
1079-
"rules": {
1080-
"header/header": [
1081-
// hygiene.js still checks that all files (even those in this directory) are MIT licensed.
1082-
"off"
1083-
]
1084-
}
10851074
}
10861075
]
10871076
}

‎.github/commands.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@
7373
"rebornix"
7474
]
7575
},
76+
{
77+
"type": "label",
78+
"name": "notebook-triage",
79+
"regex": "notebook.*",
80+
"action": "updateLabels",
81+
"addLabel": "notebook-triage"
82+
},
7683
{
7784
"type": "label",
7885
"name": "L10N",

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ node_modules/
77
extensions/**/dist/
88
/out*/
99
/extensions/**/out/
10-
src/vs/server
11-
resources/server
1210
build/node_modules
1311
coverage/
1412
test_data/

‎.vscode/notebooks/endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"September 2021\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"October 2021\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/grooming-delta.github-issues

Lines changed: 70 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -159,21 +159,6 @@
159159
"language": "github-issues",
160160
"value": "repo:microsoft/vscode-test is:issue created:>$since"
161161
},
162-
{
163-
"kind": 1,
164-
"language": "markdown",
165-
"value": "# vscode-chrome-debug (deprecated)"
166-
},
167-
{
168-
"kind": 2,
169-
"language": "github-issues",
170-
"value": "repo:microsoft/vscode-chrome-debug is:issue closed:>$since"
171-
},
172-
{
173-
"kind": 2,
174-
"language": "github-issues",
175-
"value": "repo:microsoft/vscode-chrome-debug is:issue created:>$since"
176-
},
177162
{
178163
"kind": 1,
179164
"language": "markdown",
@@ -294,21 +279,6 @@
294279
"language": "github-issues",
295280
"value": "repo:microsoft/vscode-html-languageservice is:issue created:>$since"
296281
},
297-
{
298-
"kind": 1,
299-
"language": "markdown",
300-
"value": "# vscode-jshint"
301-
},
302-
{
303-
"kind": 2,
304-
"language": "github-issues",
305-
"value": "repo:microsoft/vscode-jshint is:issue closed:>$since"
306-
},
307-
{
308-
"kind": 2,
309-
"language": "github-issues",
310-
"value": "repo:microsoft/vscode-jshint is:issue created:>$since"
311-
},
312282
{
313283
"kind": 1,
314284
"language": "markdown",
@@ -334,6 +304,11 @@
334304
"language": "github-issues",
335305
"value": "repo:microsoft/vscode-languageserver-node is:issue closed:>$since"
336306
},
307+
{
308+
"kind": 1,
309+
"language": "markdown",
310+
"value": ""
311+
},
337312
{
338313
"kind": 2,
339314
"language": "github-issues",
@@ -519,21 +494,6 @@
519494
"language": "github-issues",
520495
"value": "repo:microsoft/inno-updater is:issue created:>$since"
521496
},
522-
{
523-
"kind": 1,
524-
"language": "markdown",
525-
"value": "# language-server-protocol-inspector"
526-
},
527-
{
528-
"kind": 2,
529-
"language": "github-issues",
530-
"value": "repo:microsoft/language-server-protocol-inspector is:issue closed:>$since"
531-
},
532-
{
533-
"kind": 2,
534-
"language": "github-issues",
535-
"value": "repo:microsoft/language-server-protocol-inspector is:issue created:>$since"
536-
},
537497
{
538498
"kind": 1,
539499
"language": "markdown",
@@ -638,5 +598,70 @@
638598
"kind": 2,
639599
"language": "github-issues",
640600
"value": "repo:microsoft/node-jsonc-parser is:issue created:>$since"
601+
},
602+
{
603+
"kind": 1,
604+
"language": "markdown",
605+
"value": "# vscode-jupyter"
606+
},
607+
{
608+
"kind": 2,
609+
"language": "github-issues",
610+
"value": "repo:microsoft/vscode-jupyter is:issue closed:>$since"
611+
},
612+
{
613+
"kind": 2,
614+
"language": "github-issues",
615+
"value": "repo:microsoft/vscode-jupyter is:issue created:>$since"
616+
},
617+
{
618+
"kind": 1,
619+
"language": "markdown",
620+
"value": "# vscode-python"
621+
},
622+
{
623+
"kind": 2,
624+
"language": "github-issues",
625+
"value": "repo:microsoft/vscode-python is:issue closed:>$since"
626+
},
627+
{
628+
"kind": 2,
629+
"language": "github-issues",
630+
"value": "repo:microsoft/vscode-python is:issue created:>$since"
631+
},
632+
{
633+
"kind": 1,
634+
"language": "markdown",
635+
"value": "# vscode-livepreview"
636+
},
637+
{
638+
"kind": 2,
639+
"language": "github-issues",
640+
"value": "repo:microsoft/vscode-livepreview is:issue closed:>$since"
641+
},
642+
{
643+
"kind": 2,
644+
"language": "github-issues",
645+
"value": "repo:microsoft/vscode-livepreview is:issue created:>$since"
646+
},
647+
{
648+
"kind": 1,
649+
"language": "markdown",
650+
"value": ""
651+
},
652+
{
653+
"kind": 1,
654+
"language": "markdown",
655+
"value": "# vscode-test"
656+
},
657+
{
658+
"kind": 2,
659+
"language": "github-issues",
660+
"value": "repo:microsoft/vscode-test is:issue closed:>$since"
661+
},
662+
{
663+
"kind": 2,
664+
"language": "github-issues",
665+
"value": "repo:microsoft/vscode-test is:issue created:>$since"
641666
}
642667
]

‎.vscode/notebooks/my-endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"September 2021\"\n\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"October 2021\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/my-work.github-issues

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry\n\n// current milestone name\n$milestone=milestone:\"October 2021\""
10+
"value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub\n\n// current milestone name\n$milestone=milestone:\"October 2021\""
1111
},
1212
{
1313
"kind": 1,
@@ -92,7 +92,7 @@
9292
{
9393
"kind": 2,
9494
"language": "github-issues",
95-
"value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"needs more info\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:engineering -label:error-list -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:live-server -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:network -label:notebook -label:notebook-api -label:notebook-celltoolbar -label:notebook-diff -label:notebook-dnd -label:notebook-editor -label:notebook-folding -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-keybinding -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-statusbar -label:open-editors -label:opener -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-explorer -label:remotehub -label:rename -label:sandbox -label:sash -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:table -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-links -label:terminal-local-echo -label:terminal-profiles -label:terminal-reconnection -label:terminal-rendering -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typehierarchy -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-build -label:vscode-website -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom"
95+
"value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"needs more info\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:engineering -label:error-list -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:live-server -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:network -label:notebook -label:notebook-api -label:notebook-celltoolbar -label:notebook-diff -label:notebook-dnd -label:notebook-folding -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-keybinding -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-statusbar -label:open-editors -label:opener -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-explorer -label:remotehub -label:rename -label:sandbox -label:sash -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:table -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-links -label:terminal-local-echo -label:terminal-profiles -label:terminal-reconnection -label:terminal-rendering -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typehierarchy -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-build -label:vscode-website -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom"
9696
},
9797
{
9898
"kind": 1,

‎.vscode/settings.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"**/.DS_Store": true,
99
"build/**/*.js": {
1010
"when": "$(basename).ts"
11-
},
12-
"src/vs/server": false
11+
}
1312
},
1413
"files.associations": {
1514
"cglicenses.json": "jsonc"
@@ -27,8 +26,7 @@
2726
"test/automation/out/**": true,
2827
"test/integration/browser/out/**": true,
2928
"src/vs/base/test/node/uri.test.data.txt": true,
30-
"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true,
31-
"src/vs/server": false
29+
"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true
3230
},
3331
"lcov.path": [
3432
"./.build/coverage/lcov.info",

‎.yarnrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
disturl "https://electronjs.org/headers"
22
target "13.5.1"
33
runtime "electron"
4+
build_from_source "true"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ steps:
8484
set -e
8585
export npm_config_arch=$(VSCODE_ARCH)
8686
export npm_config_node_gyp=$(which node-gyp)
87-
export npm_config_build_from_source=true
8887
export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
8988
9089
for i in {1..3}; do # try 3 times, for Terrapin

0 commit comments

Comments
 (0)