Squashed 'lib/vscode/' changes from fd6f3bce670..ead2c2ab0f5

ead2c2ab0f5 Merge pull request #120858 from microsoft/alex/1-55-2
bfb2654224e Pick up new distro version and bump version
08a217c4d27 Merge pull request #120733 from microsoft/joao/release/1.55/fix-build
6b89f1aaa2e Don't call node-gyp anymore (#120673)
6e3220a31a9 Merge shellEnv into process.env (#120332)
5dee7d559ff Update to vscode-proxy-agent 0.8.2 (#120354)
91fa7f030d2 Merge pull request #120519 from microsoft/misolori/icon-updates
c5e030273bf Merge branch 'release/1.55' into misolori/icon-updates
8be12407ad0 bump version to 1.55.1 (#120379)
d6e72b493ce debug: update js-debug (#120358)
b7d152d5b2f Update distro
c185983a683 Fix table list height. Fixes #120062 (#120102) (#120168)
c71be15869a fix powershell profile source (#120138)
4c2a1fa6306 handle error when wsl is not installed (#120128)
e3297826776 Merge pull request #120107 from microsoft/aeschli/120103
c7f963cb27d Moves extension prop out of proposed
55f4c2ec1e2 update typescript-vscode-sh-plugin
26a60dbecac Merge pull request #120081 from microsoft/sandy081/fix119975
5753889f2d1 remove overflow action when there are no overflows
be363080a36 fixes #120066 (#120080)
554774c21d6 Merge pull request #119983 from microsoft/lramos15/notebookViewType
428daa3650c Merge pull request #119990 from microsoft/tyriar/r155_wsl_compile
64876cb88e2 Fix test compilation
00296950306 [Getting Started] new file => new untitled file rather than explorer's new file (#119981)
2a8113f7231 Enable terminal event batching from ptyHost (#117268)
aefdd723bd0 Merge pull request #119987 from microsoft/tyriar/r155_wsl_setting
98aeda8479a Remove RemoteHub from desktop stable (#119972)
981a2b53abc Merge pull request #119977 from microsoft/digitarald/fix-115327
a3514cd1481 allow terminal profiles w a source to have args (#119967)
78636f2c133 Fixes #115327 with HC images for GS setup/beginners.
b72964aaace iPad OS ctrl + c in terminal  (#119979)
a84f17acbbf displayDetectedWslProfiles -> useWslProfiles
1b0b1c67f35 Merge pull request #119973 from microsoft/digitarald-ces-distro-update
c97d55a2131 debug: fix stop on entry not working after launch.json change (#119980)
c7068ae9331 Respect viewtype for reopen with in notebooks
59b2869bdb1 Distro update
7208128b818 Merge pull request #119377 from microsoft/digitarald/ces
522cb113395 Ignore extension that is being installed
d06d2f1d624 Update distro
80c9c2bfdd8 Adopt writeSync maxSubsequentCalls
dd8ce595220 xterm@4.12.0-beta.7
1eb987f85f1 LocalizationService.update no longer needed. Fixes https://github.com/microsoft/vssaas-planning/issues/3290
70aab480c5a update labels for break commands
49ad7ad4f53 fix optional service typing
a0aea2c02ab Fix counting executing cells incorrectly Fix #119921
961935482ff Fix build
33c5dbf0407 Force internal execution metadata to be transient Fix #119853
0865813de51 showQuickLaunchWslProfiles -> displayDetectedWslProfiles
91b6bcd2cce Fix spelling error
5bf977258c5 Slide to first category for new users
72bb797593f Don't scroll to first category if already have Fix #119842 Fix #119339
0a7dde45706 Update distro
9be5cb7f482 Fixes #118772: Remove a disconnected remote extension host from `extensionHostManagers`
c9829c32d11 Surface pwsh as a profile on mac/linux if it's installed
b59b0c5051e update distro
647f8724320 Roll back to `vscode-textmate@5.2.0`
a564f58b13f Fixes #119065: Also listen for EPIPE errors on the socket
99c8eb69942 Fixes regex - codespaces remotes are missing .git
ab39731a1e6 Avoid rolling back `vscode-textmate`
9b564ad40db update distro
85d03e9c382 Fixes #119915: Go back to `vscode-oniguruma@1.3.1`
f4f1bdb9265 update distro
e15a185f6ee Merge branch 'main' into notebook/dev
a6cef60b50f notebook toolbar init display be none. fix #119910.
654b5e80469 update to latest `vscode-oniguruma`
5a92084faeb Use ThrottledDelayer per review feedback.
357c13ac467 localize info message
5dcccb92e38 fix #119854
1ca4e703ba8 Optimizing newly add getting started images.
71d2102d7d0 fix #119803
c5d901812cd Merge pull request #119883 from microsoft/tyriar/webgl_fix
f7cc0f2c79d Adding light and hc getting started images. Closes #115325 and #115327
64256f22d66 Merge pull request #119895 from gregvanl/settingTypos
ad659fb25aa Allow null in profiles config
3e6f65a3acd Merge branch 'main' of https://github.com/microsoft/vscode into main
a30b6bfdc3b remove default value for overrideName
19bbe2edbee Remove extra space from error message
7ac7d4438a9 fix #119672
975115a2cb4 Setting descriptions typos and formatting
fe6b3e258b6 Re-enable measuring
c5a8eed0334 Accept array or single item for output items methods #119601
996391b87d3 Move proposed api piece into stable typings
6ebe2a14f37 fix #119852.
3d1d01690df Fix canvas -> dom fallback
da992a171e2 fix scroll cells from bottom view.
9ab0fb227ee use app scope
81a08478ef1 updated notebooks
ff869cd3581 Merge pull request #119878 from microsoft/isidorn/notificationVisible
1a184f9e9dc add visible flag to notification
b70c4fee0d8 Fix default webgl renderer
ad026f8130c ces: use ThrottledDelayer
755cbf5412a Merge branch 'main' into notebook/dev
08c4cd87e3c Reenable localization tests.
5064fae294b Fix #118134
e8111f76b5b Fix #119855
5b636c4a7b2 Revert "Fixes #111814 (#119475)"
6f726bcdf6a fix #118442
557c4b56995 update verification members
63f1721ed85 don't store output in GH issue notebooks
05ce54df77c testing: remove unused contributions
ce9298464e4 bring notebook actions back to editor title bar menu static.
ceff50539f0 re #119706.
ef80780f632 fix #118996.
383fb64cc58 remove displayOrder and fix #119830
81ba1dae860 Fix #117540
1a425eacb83 Accept single outputs or arrays in execution task output edit methods Fix #119601
75ed057885c fix #117937
1e6697ed77d fix #119561.
f0eacf87700 fix #119767.
1d3cbad0102 Wait for extension registration when resolving notebook viewType Fix #119686
ab317a2280e Hide select terminal profile in yarn web
a0e8b01ec49 testing: polish wording of testing.autoRun.mode
189fb15df90 Check PATH when validating non-absolute paths
5c6836eb44d Fix #119699
b63cfb3a8b6 skip test and remove unused code
8d6c2a23888 Make drop shadow much more subtle Closes #119633
23713de2bee don't emit events when splices are empty, fixes https://github.com/microsoft/vscode/issues/119608
5a241c767a9 fix https://github.com/microsoft/vscode/issues/119363
22212f5de84 use APIs over commands, fixes (?) https://github.com/microsoft/vscode/issues/119437
bd2402a6e8e Add double-click to collapse Fix #113248
c45540033a5 Aadd messge when getting started empty closes #119496
d115bb2a977 clean up statProvider, use existsFile, fix #119807
008e91bd7c9 contribute editor toolbar actions by checking active editor other than focus/blur. fix #119706
38160c823c8 Fixes codespaces fork on push
d765f3a43c7 testing: fix list view not working
0fb1882984e fix: items from results being added to collections and breaking decorations
ab94ad2b8f5 clean-up validateProfilePaths
46d5d38dd28 fix #119672
ebec68bc3d9 fix #119728.
2616ee94f38 fix #119775.
6384c7462f8 fix #119677
abaa23cdf39 fix #119774
09f43fd6aa4 testing: fix exclusion filter in view
e4bb4c1b77f testing: fix results disappearing or not showing for new files
cd31f2cdfac testing: fix test appearing on first line, remove location from TestItems
60849897630 fix #119773.
15ba6b4c957 Revert "extract _assertWebviewForMarkdownPreview"
2c232fed6af Update README.md
e3e7fb0b2ab Set explicit mode for markdown preview code
addf2d6d9e9 Fix spelling for gitignore
f8c1ffbb0cf Build simple-browser media during watch
68e582380d7 Maybe fix bug where sync task doesn't get checked
d087b5cf4f1 Add back old getting started flow as "walkthroughs"
e5afd670959 extract _assertWebviewForMarkdownPreview
d13e68e6cf5 avoid markdown preview removal when it is disabled.
8a960081e55 fix #119771.
f1334e055c8 Polish select default profile quick pick
563a617ca2a Applied review feedback and tweaked heuristics
8aac8643d77 Use 'terminal profile' instead of quick launch profile, change icon
64b4f5b934d use final DAP 1.46.0
f04acbd22a4 node-debug@1.44.19
0db170025e4 Fix terminal dropdown rebuilding itself
8ceb8b96153 Rename "expand cell content" to "input" Fix #119762
9e2e6cded21 Change cell pending indicator to clock codicon Fix #119739
ddb7709cbf3 Fix #119700 fix #119731 fix #119701 Co-authored-by: Daniel Imms <daimms@microsoft.com>
51c403193b6 do no change selections if the action is from toolbar.
7d19db7ad9b fix #119769.
f934e058c75 Fix profile permissions prompt on linux/mac
6dbb3800c5a Fix #116424
b8f5fd7f1b6 debug: update js-debug
c88146514ca debug: bump node-debug
8387a46298e snap-build-linux.yml: use "snap pack" to get LZO (#119478)
792c2318898 fixes #118660
eb135ec46e8 Fix #119626
e353502fb9d fixes #118045
f9d92f0fc6c Fix #119723
948839aa445 Fix #119660
6aa6260a843 fixes #118852
da1ed96b6a8 fix code-cli.bat
aeedd850ac4 fix #119073
2d9069014eb Add a placeholder for already forwarded root ports (#119792)
74cf3fb2021 Fixes #119529: Wait for eager extensions to activate before launching extension tests
5fbba30c046 Better Fix #119573
9a646e1967c fixes #119487
f91c464f1e1 Merge pull request #119784 from microsoft/tyriar/profile_schema
9f37f3f04ee Pull common unix/win parts into shared function
ac74acadddf Only set when win profile is non-null
f4fbc4abd78 Merge remote-tracking branch 'origin/main' into tyriar/profile_schema
a83eb44ecd5 fixes #119488
301e9ac1db8 fixes #119580
a34297a6085 fix #119384
47f0413ea29 window indicator: based on workspace config file location. For #119752
40d104ad84a Add schema to profiles settings
771b0192f43 window listeners handling
27fc3b41ed4 scm: add trace logs for #113803
08d5310eb18 update verifications notebook
8933c1564d0 Don't create a terminal on panel show without proc support
c55aff63798 API feedback (WorkspaceTrustRequest -> WorkspaceTrustRequestOptions) (#119658)
3eb6fec8cd6 Be more specific when listening for marker events
4ad88afc1f2 Fix #119573
42b8129c64e don't emit events when splices are empty, fixes https://github.com/microsoft/vscode/issues/119608
4dedb019f85 Clear data written flag on manual relaunch
1c3990938b8 Fix #119572
443b6f71bf8 fix https://github.com/microsoft/vscode/issues/119363
c6a8cb7f091 Fix #119698
8437d38d364 Fix #119753
a1ecc83a5d3 Merge branch 'main' into notebook/dev
a233c8683a2 workspaces history - proper check for untitled
7a1302a2b6c remote indicator - fix npe
90484dda2b2 shared process - also log if window visible
5245290dc56 file working copy - update test to account for events
2b66dfe0218 skip flaky tests.
d5abce78ab7 Remove unsued var
ff42bf46511 Disable markdown renders by default
279b4d92317 fix #119724.
514eefb789e Don't send execute request for markdown cells Fix #119734
91939fb9e7d handle invalid ignore options and avoid early dispose. fix #119638
548de3ac8ba fix #119708
85770c31911 hide all outputs (builtin and renderers) fix #119690.
a8b8e7bd483 Fixes #118979: Reduce find widget's z-index
11c0904a568 Don't enable the new markdown renderer if accessibility mode is enabled
376b25645be Only show selection if there multiple cells selected
31987b11c6f Merge pull request #117758 from conwnet/main
02b394a1a5c Add a special editor option to control the readonly textarea attribute
a9aebe3bce0 Merge remote-tracking branch 'origin/main' into pr/conwnet/117758
07eb4d9e076 Fix #114965
d7e1da38b17 Fix Linux referring to osx
8d3d8e0cd04 html: add vscode-languageserver-textdocument as dependency
bd18fe9bcec Fixes #119632: Handle `undefined` when validating a range
8c7a3d8f6ca html: fix compile errors
c099b873de7 update distro
0f65e64c2a3 Fixes #119636 - 🤦
76c5d1707cb RunOneScheduler and code cleanup for CES
b3058d60df4 update distro
7b7e3d9e1e5 Fixes #118041: Add workaround for `UTF16` `TextDecoder` eating up `0xFEFF` and `0xFFFE`
c7ad1b9020d Add sequences to type ahead comment
97b2514ca71 include source.id for progress notifications
6349f37d80f Merge pull request #119373 from wdesgardin/fix/replace-pattern-preserve-case
cca8a48b17a Restore notebook smoketests,  Fix #113882
3225cf3037a update distro
3b44bb422d3 Only set detected profile if value is non-null
75f796dfb48 notificationTelemetry: id should always be a string
4eb625f0cf0 [html] update service
a53ce8af3b5 update remote indicator on workspace change
11e79c76d89 Merge pull request #119607 from NotWearingPants/patch-3
a780b76b9d5 Keep text from jumping when showing port input Fixes microsoft/vscode-remote-release#4729
61eb66d6c4b Fixed recent typo from afca445
64381abea97 unconfiguredPortsAttributes -> otherPortsAttributes Fixes microsoft/vscode-remote-release#4732
73b9e6679d5 Update README.md
a535549d893 update distro
f600cd9ef21 Fix compilation errors: update to latest `vscode-textmate`
684a4526059 Improve resolveTask documentation
ab12e39334e update distro
788c9dfdc48 update deps
afca44535df Add a trace statement to be able to track down which implementation handles a `MultiCommand`
9089e0cbd9f Update endgame notebooks
b28d8ca9fe0 use APIs over commands, fixes (?) https://github.com/microsoft/vscode/issues/119437
2bc5e538923 Merge branch 'main' into notebook/dev
ebe56205433 fix(search): preserve case when match start with lowercase char
a6f6b4aa8e3 Add feature flags to control availablity of getting started extension contributions
735e998fca0 update distro
10a74ff5c51 Open to getting started page on extension install
194c37b4cf2 Fix test for latestExecutionSummary init
9fa49ba9415 ignore optional dependencies when webpacking
7a8b665f25a Fix missing prop on cell data
808266d4dec Allow tests to be loaded asynchronously (#119537)
6e2cb85e207 debug: update js-debug
fdc4f23b108 Add double-click to collapse Fix #113248
35ae55affde diff editor output decorations fix.
aac461a3124 Improves behavior for #114945
851a849d2ce Don't validate non-absolute paths
2cde743fe21 Pass event modifier data when clicking on markdown cell
4cb75127664 add quick launch profiles for unix
9c00242866c updating telemetry module for built-in exts
3d987fdc5b3 fixes #117782
084fd5171a1 Terminal profile fixes (#119352)
7483058a0ab update distro
1f5dd686c8f Disable select for notebook preview cells in webviews
a685b5976ba Exclude DSR from type ahead
4b3ba3ea44c Removes proposed api check
44ffe526ffe auto layout for editors in output container, fix #119048.
d4a0fa9ca6d Build getting started service at startup in order to init event listeners
d657779c014 Improve getting started response to slow network conditions for content overrides
efb75d7262e Move override delay to conver all exp service usage
018eca5246f fix #118615 'scm/resourceXXX/context' extension point descriptions were muddled
0179466adac Move getting started service to workbench/contrib Closes #118603
e8290f52f4f run oss tool for 1.55
db670f1002c Use shellEnv (#108804)
64042213ed2 Bumps RemoteHub to 0.1.2
f201f7bc68a Fix notebook test
08cf8038dfd Merge pull request #95882 from jeanp413/fix-95671
4977db85c01 update tas-client-umd
7e719d3f046 Merge branch 'notebook/dev' into main
03e1ce6524d Fix getting started items appearing out of order
4a83a80aa7b update diff output height properly (using closure) on resize.
2949009de61 move more logic into abstractRenderer.
55e56ef9153 add options for controlling outputs/metadata in the diff editor.
0089ba3ae1d Bump vscode-emmet-helper, fixes #112675
c95389a7b2d Fix emmet completions in scss (#118666)
7b96cc4c8ba Implement Execution API (#116416)
4b0118871f0 Adds codespaces lookup via command for desktop
d46eca3d2dd Merge pull request #119385 from microsoft/merogge/fix
7176a40fc74 Add notebook.inactiveSelectedCellBorder (refs #114156)
64a8be3fa24 fix #117691
a2044cbd78d tweak
d909932d240 Fix #118104
33c11ec866f Bumps RemoteHub to 0.1.1
26cdfad1cd0 Fixes #118521
e79b88daadb handle view in terminalView
66961037cc3 Fixes #111814 (#119475)
57aada6cca9 Fix test
5efebbd4c4c Fixes #118270: Add new option to control deleting character pairs and delete by default only auto-inserted closing characters
91e41167e52 file working copy - clarify onDidChangeContent
8cfc30d5741 Fixes #118461: Don't show Open Workspace in the diff editor
c148f9a70bf Show error when port is already forwarded Fixes #117571
d239450d9b1 Ensure relaunched processes get shutdown
76b1ad1d1dc Improve profile order, remove profileName from config
6bac57decf7 file working copy - better document resolve() method
0ddc091edc6 some code 💄
a02448d6852 Ensure config service is optional in external terminal
917edde164f Fixes #117534: Allow to mark command args as optional
2cd8246a94b Fixes #118062
4c29fa41c6d Fixes #119416: Use control pictures for NULL and DEL when renderControlCharacters is on
cc8748a2397 notificationsTelemetry: change id to be string
bbe333f8782 Add tsec exemptions
42c9e63a7ed file working copy - resolve returns void
d9d0879741f file working copy - add save as support and a lot of tests
469e4f6e275 chore: bump distro
67eebf8ac58 avoid duplication.
0ab3c62ca2a fix action context detection.
5a0fe1f6a89 remove todo tag
d6a0bf700cd Merge branch 'main' into notebook/dev
5a66c91c029 Fixes #117935
a3415e669a8 Fixes #119383: Use `fetch` instead of `importScripts` to avoid deadlock in Safari
4a10c93b2d6 Remove unused argument
307ed64376a Adds RemoteHub as built-in
8290994dbbe Fix localization strings and typo
4995ce93673 More tweaks to geting started category
13ec92fe360 Update getting started category styling
e380c34cac7 Fix typos
a1c114aa9e6 replace more pathOrPaths with path
1aa0c31b55b pathOrPaths -> path
e7aedd975c8 Adjust notebook cell multi-select colors
4bcf96223a7 Fix some getting started crashes
0d83680d528 More CES heuristics work
d222e20941c Merge pull request #119328 from microsoft/tyriar/wsl_encoding
e92a80bb641 Merge remote-tracking branch 'origin/main' into tyriar/wsl_encoding
ee4b50aaa43 Allow creation of quick launch profiles via select default shell command
194f43025f6 Remove log
da7c7d1efea Merge branch 'main' into digitarald/ces
4b5354c5f98 alternative version for notebook document.
ff3c423cf3f alternative version for notebook document.
6480a6f20ea feat: add option to control scm font size (#115494)
d60cac30195 Fix a typo
f8acb0d6f63 Adding the 'delete branch...' function to the source control > branch section
6c0c77926ff Improve GitHub repository search
64ebc978e76 Revert "Use rmdirSync instead of rimraf"
0eff78fc42e Merge branch 'notebook/dev' into main
7f9ea9411c8 Reduce default tas override delay to 0
5c0c637a043 Make sure we ignore compiled media files
f5146529508 Automatically relaunch terminals when pty host is restarted
7727e93b22e Rename experiment override settings Log when experiments have been overridden for purposes of excluding data from scorecards
07879df53d9 update the layout since editor toolbar height changes
13ceef289f0 experiment service for nb toolbar position
1cd067471e8 Trims url to avoid issues
022d823577a Fixes #110904 - adjusts error regex
c2b6d30e9ef Fix input placeholders from 2275dba01afe2b8814d4ebdd67d1027fa51bdcb4
b1770e6ad8a Prompt within 1-8hrs heuristics
df3953996da notifications: send telemetry for silent notificatinos, smarter spot for hide event
f7f2f08eec5 Update distro
1b7470b25db Try to find ports with a root process (#119341)
421d67ec41a notifications: add source to notification:hide and also send events for silent notificatinos
2275dba01af Change files to include/exclude placeholder to tooltip
3d87801cb0c Merge pull request #119091 from microsoft/joh/nbSerialize
9734ab15dd6 💄
88e87f02bd6 file working copy - make resolve not return "this"
b74bae8ced6 refine NotebookCellData converter
d6c74de1f5c Merge branch 'main' into notebook/dev
61b73024053 Merge branch 'main' into joh/nbSerialize
3a6c54fb14e no more file watching in notebook diff editor, remove lastResolvedFileStat from notebook editor model
39ea9cac052 Make UI progress indicator clearly visible in the quickpick (#119293)
8cf7c12fd33 fixes #119331
d10866cca54 Fire onExit for feature terminals that lost pty host connection
7fa2b715ef0 Merge branch 'main' into joh/nbSerialize
b33801c2c66 file working copy - first cut tests
8736be196db Properly join string[] profile args
f68f1845d23 Move comment to the right place
2b2ff3e5e08 exec with the right encoding
ede3632a560 pimp up workbench-web.html
85cf30ab517 Properly decode wsl.exe -l output
163aeeedac7 Prevent seamless relaunch triggering multiple times
c64a8d59270 file working copy - use IDisposable not Disposable
bae75adfb41 no more double dispose needed in _onWillDisposeDocument
af10c8f65b5 Fixes #119051: Prefer fewer diff hunks
3271248da68 Merge branch 'main' into joh/nbSerialize
7902c6edcd1 remove NotebookService#destory
c8dc60adac6 Use widget.shadow for custom hover contrast
a07a508be8b Update distro
a02fabb6d64 file working copy - dispose model when working copy disposes
dfe12887da0 xterm@4.12.0-beta.3
06901e67a38 remove todo
3fd2415c9f7 Show args in profile selector
46d1ea3a2c8 fire event only when save succeeded
8410aa8f2e6 adopt name change
fee37f32af6 Merge branch 'main' into joh/nbSerialize
3f71de52eef Also exclude docker-desktop terminal profile
7d99c47b755 move notebook save event into notebook editor model service, remove resolve/save/backup from notebook service and let editor model use content provider directly
06e8814b29b Merge branch 'main' into fix-95671
5dad121bcb1 Merge pull request #119315 from gjsjohnmurray/fix-119261
a255250be89 Add a user setting for "workbench.hover.delay" Fixes #117894
156fed280ac fix #119261 filter also by description in Insert Snippet
1dbcde0f1fc Fixes #119065: Handle errors also using the socket.write() callback
958171a700d Fix port process finding starting even when using output
56b55c26070 #38607 Handle uninstalling extensions
a27b6f74497 implement load of the notebook model
f841a70b0c0 file working copy - rename `forceReadFromDisk` => `forceReadFromFile`
c8975ceaecd file working copy - remove getStat() that is only used in tests
8595f6f5d03 Update to align log level constants
23fa2860d3e add withNotebookDataProvider as strict variant of getXYZ, sends activation event, throws when no provider found
c17a5ca80f7 Merge pull request #100027 from matthew-haines/master
bed126ce9d7 #38607 Separete installing & installed state
6608083a3d4 💄 window error telemetry
ce3ebc9f5a6 add test
391b1a6b576 Add support for `"log": "<level>"` to the argv.json (fixes #118824)
d96f34c867b Fix #38607
e800c205df8 Merge branch 'main' into pr/matthew-haines/100027
b4fb4d8c2ff recognize .axaml as xml language Fixes #117298
abd1e0166e9 Merge pull request #119250 from noahbliss/patch-1
414a7eb7e06 Fixes #113614: Catch potential errors thrown when searching in the extension gallery
9710ecf1c66 Merge branch 'main' into notebook/dev
af8d8116eec Merge branch 'main' into joh/nbSerialize
9b5eceb1f66 💄
4f1cdb7aa0d flaky suite for #118969
d0f2d7eee63 build
e4b1e9ac57a Give room for border
0932039e138 Allow for exp modifications of getting started content
22c40603121 Extensions => Command Palette
5e0602716fe Small tweaks to styling.
fb8811e513b Add "copy cell down" to toolbar
7a9844238d8 terminal profile fixes (#119267)
c0885dd0c4d Add task to build extension media (#119294)
b0f4dba5d29 handle blur from other browser events.
3eae316f513 more padding for global toolbar.
99dd29307d1 no layout if not visible.
6d654b9bc9e polish css.
a99306b4871 Update padding for notebook toolbar & folding icon
fbcd54712ef fix duplicated actions on reload.
41ecc1eda5a cell output domNode npe.
c37f743a99e schedule task should check disposable again.
b814edf4735 keybindings for actions.
ece0761b33f swap notebook toolbar and editor toolbar.
1b52d828711 Revert "fix profile tests, path -> pathOrPaths, and  exception"
a5219a9350c path -> pathOrPaths in terminalConfig
e9e112a6483 fix profile tests, path -> pathOrPaths, and  exception
859edd7f4f0 Merge pull request #119292 from microsoft/misolori/get-started-polish
89135921788 Increase bottom padding for card
45ef6493842 Adds support for fork on push for Codespaces
f8b50611060 Polish getting started items
3b3b9be7062 Fixes #113811
746c323a55a Merge pull request #118830 from microsoft:aeschli/testsinwebworker
242ddc4bdf0 Merge pull request #118400 from thebinarysearchtree/main
c576cad0912 #38607 make renaming extension aware of other sources
89d8eed14f0 Allow extension authors to set the title of a QuickPick/InputBox in Options (#119144)
31a9b8f8158 Fixes #62307
14c4257e75d Fix background for markdown cells
651f0ee28a1 Simplify removal of (Default) from distro name
aef8a2af5c6 Improve encoding workaround for wsl.exe
9d2478b6259 Don't name quick launched terminals
a7bafc2a9a5 Add logging around port notification Part of #117790
342a55d10d7 worker eh: wrap console and send to renderer
7c4b2b09de1 add workbench-web
2ace42b0cc1 Don't attempt to create term in yarn web
9cd4712b352 file working copy - update todos
6bea69b5e2d Fix break
3a39aa41f5b Fix hiding tree hovers Fixes #118755
65fb4037a39 adopt latest working copy changes
59ee7787595 Merge branch 'main' into joh/nbSerialize
232266aaf22 first cut of IFileWorkingCopy adoption, misses saveAs and backsnapshot are improper...
2d7b64d423d add notification:hide event
9c204017ffc file working copy - remove _backupSnapshot
be93116b735 Replace "Favours" with "Favors"
9f773417714 Replace "Favours" with "Favors"
a23d2d40f31 Merge pull request #117994 from GitMensch/patch-1
4c9d23c8f57 file working copy 💄
adf6e065194 Fix ugly selection border on Add Port button Fixes microsoft/vscode-remote-release#4689
0b758c4e0d6 Unix profile selector (#119213)
abbd77d0188 Merge pull request #119075 from microsoft/isidorn/notificationsTelemetry
99d2cb82e59 pick up notification source ID properly
5804f7dd83a Merge branch 'main' into aeschli/testsinwebworker
8af8a869dc8 Merge branch 'main' into joh/nbSerialize
3da9f36645d Cancel packagejson search in npm after 1 second
c359effab04 Fix unconfiguredPortsAttributes in devcontainer.json
abb6ff6d93e file working copy - dispose working copy when model disposes
733f9323a46 Initial file working copies (#119233)
970d1916421 file working copy - self register to working copy service
1902dcddd8a file working copy - add onDispose
6d02fe2cb75 fix #118945 validationMessage on extension InputBox lacked Severity.Error
943ab428d72 file working copy - more cleanup and alignments
d2afd69d310 file working copy - some cleanup in working copy
111a6cec70f Don't include build files in repo
3e4c057624b Make sure we exclude ts files from published build
043a0ee0d94 Try cache busting on reload in simple browser
b9f33fc242d Rename CodeActionKind.Manual -> Invoke
52201359920 Scroll the notebook while dragging a markdown cell
e7f3b77a9c8 Remove typings for unused package
a7ae58f4dbb Use rmdirSync instead of rimraf
05e970086cd Add missing change session events to ms auth provider
b0bbf9c19ee improve pwsh logic
e01b60782ae Exclude compiled notebook files from hygine
42af2c38dd2 Merge pull request #117835 from yannickowow/master
7ccf0b03c60 debug: stepOver should be alt+F11 on windows browsers
8a095f4d233 Update test associated to DataBreakpoints
cf7e6f31f9c Support for DataBreakpointAccessType condition #117835
82cf09af92e file working copy - first cut manager
c332b6bea79 tweak grammar
31f3f2e6195 Add placeholder text to include/exclude boxes Fix #119107
547312993f8 provide extensions sync state version api in web - reset the resource sync state when the version changes
6f0d3d5c9f5 debug: do not de-dupe same named variables
fbc577e6f04 Double click to set port label Fixes #117573 Fixes microsoft/vscode-remote-release#4624
5b21b951ecf Fix Add Port row click Fixes microsoft/vscode-remote-release#4687
fc1d49f95ed file working copy - make sure to bubble up errors
03e3fce973e file working copy - first cut extraction from text file model world
b335d9eaf10 Make "Set Port Label" an inline action only Part of microsoft/vscode-remote-release#4624
fdb91e27d3d Add new unconfiguredPortsAttributes to config edit
a268122729d Add more docs to PortAttributesProvider Part of #115616
1c6fcca5710 Fix #115039
c9fd3403447 fix https://github.com/microsoft/vscode/issues/119157
b12279b40c5 Get correct candidate for checking port attributes providers
fd57115d52c Allow for manually/programmatically checking/unchecking tasks
b353f063393 comment out failing notebook smoke tests, https://github.com/microsoft/vscode/issues/119164
06ee68d4bbf api notebook update
5bb215e893b Increase spacing between tasks
26a77fb7fb8 Clean up formatting
08877abd68a Relocate keybinding rendering closes #119113
970bcad11a4 Fix bug where expanded tasks did not adjust height on layout
1bcf2a3f1dd Tweak getting started to look more like welcome
9e470ce1efc chore: update distro
0585c2e05a6 Remove experiment (#110330)
ff1ce589e73 fix #119130
fc8d7681c4a Make sure katex styles are shipped under root of
581a659d427 Update markdown notebook scripts
806c22dcc91 Skip multiple tabs test for now
a7006f93215 Fix potential null access
f6f51117008 Update walkthrough contribution api to single object model Ref #119097
e8e6d64105b  Terminal profiles  (#118790)
e5fc49d8af8 Fix markdown editing code cells not having top margin
c09b3d2358f typescript: enable built-in 2020 semantic token support
1b695635457 Enable markdown renderer by default on desktop
83d80e8bcaf Don't try to relayout markdown cells if their height has not been set yet
772effc6e6c bind mimetype switcher later.
9063d4ac766 finalize InlineValuesProvider API; fixes #105690
9205c8bd920 Improve terminal key dispatch message
5615bb9eee4 Merge pull request #118725 from microsoft/joh/117273
a6b7fccdaab support appending per mimetype.
7af7449a295 add extension id to source of notification
a294694b583 Fix padding in webview based markdown cells
a7bbb5502dd notifications.test add tests for service add and remove events
99597e3974a delete cell handles multi select.
b3e7d37b8df clipboard actions handle selections around the target.
562962afc9e move copy,cut,paste into clipboard contrib.
30845ba2037 Include community in README.md (#119105)
19ac5d4a5c5 Merge pull request #119114 from microsoft/tyriar/118804
9ed0aa6c914 Fix type ahead issue in relaunched terminals
7243e13db16 Fix #118818
8303d03545a aria alert for cell index changes.
5f4e9a55f5a join with next cells through multi selections
4f488a7cf21 support both selections and ui actions.
4d3df5cd983 join cells with multi cells (single selection)
881e370539e add tests for joining single cell.
3f7651fed04 move join/split cells out of coreActions.
184560bb0ce tests for moving and duplicating cells.
4855eb46a0a make notebook unit test easier.
3ee43778c50 Merge pull request #119092 from microsoft/tyriar/118066
29abc8f3499 Merge pull request #119024 from microsoft/tyriar/116022
3e05837735a Merge pull request #119084 from microsoft/tyriar/118256_test
143f4e6fa2b Merge remote-tracking branch 'origin/main' into tyriar/118066
7a6944d2d0d Add unit tests for TerminalRecorder
5141aba1941 polish
7c0e20ca4c0 Allow terminal recorder to avoid initial resize event
b6921c2f2d6 api notebook snapshot
9a7366de9bd Prevent process ready log firing multiple times
32406c3f6ab Recalculate trust when workspace folders change
b1359b271c5 Fix focus + keybinding issue causing input box in Ports Fixes #microsoft/vscode-remote-release#4678
0cd2ba8bddb Merge remote-tracking branch 'origin/main' into tyriar/118066
df97bc32ada Tactical fix for watching problem matcher and closed documents Fixes #116760
508b6cc7864 💄
f56b5cf7cef react to feedback
b38200cf0a3 Ignore testWorkspace tasks.json
2d536914ea1 Await task config updates
f0ee79acfd1 Update src/vs/editor/standalone/browser/simpleServices.ts
846917d51fd Update src/vs/platform/notification/test/common/testNotificationService.ts
77e2397c121 Update src/vs/platform/notification/test/common/testNotificationService.ts
3765294bb11 Update src/vs/editor/standalone/browser/simpleServices.ts
5da95f0e11d Merge remote-tracking branch 'origin/main' into tyriar/116022
31283f32b2c keep notebook serializer locally
d1e5c8cddf4 Fix portsAttributes.unconfigured setting name And fix setting update not read Fixes #118991
e8f5186722f Improve task test layout
76cd8a00b37 Fixes #119011: Wait for the vscode API to become available before launching extension tests
1b9a61662a3 Regression test for #118256
b8476ece198 Fix task start firing with invalid process ID in dependsOn task
6fd693ec9e9 more deprecations
f2761b584a4 ignore file events while saving, more logging, https://github.com/microsoft/vscode/issues/118992
9426cea171e Ports: service -> application, defaults ->unconfigured
b33ce0ff5d9 Update types
2de06d768bf add INotebookSerializer interfaces and wire up IPC calls
3014c755cd7 Pick up fix for #117054
21d20148ee5 new debug setting for clearing a terminal before reusing; fixes #116699
70abcfc7689 add notification:actionExecuted telemetry event
66045febfe4 add notificationsTelemetry
45ea71d8c37 notificationsService: onDidAddNotification, onDidRemoveNotification
149a8b71c53 Workspace trust changes (#119017)
e787d6e3843 custom editors - make conflict resolution actions appear (#118949)
5060cbe7bc0 Merge pull request #119012 from Daniel-Knights/patch-1
537c648fb57 mark APIs as deprecated
b5eff84359d fix build
b89cf5c0aff Adds RemoteHub to api allow list
4222a0981e2 debt - use product quality instead of probing for name
a7f5a101589 debt - some more process and platform 💄
892a1083cb2 Fix border overlap in quick pick UI (#119039)
405d2cfbda4 Merge remote-tracking branch 'origin/main' into tyriar/116022
70a47bb275d Enable vscode.Pseudoterminals in web worker ext host
813bb397b01 update list item height on markdown cell ctor as we might already warm up the viewport.
fbf1e77578d adopt multi select in drag and drop. drag the focus or selection around the focus.
84f16040107 share drag impl for builtin and custom md renderer.
12adb0178f6 test view/model range convertion with hidden cells.
51a15dee0a2 update seti theme. fixes #118912
7f43e5c846c unHidePreview should also update dimensions
d949fd3bc09 Don't create markdown previews if cell is in edit mode
2f8d4892884 fix: typo
d7c0ea59d23 Rename setting gettingStarted.hiddenCategories => workbench.welcomePage.hiddenCategories Fixes #118990
8e2fc51526a Remove only
f390023d7e6 Remove unused
385cb56165e Fix #118953
5e09ecb9ab2 Fix #118958
83b6cdc6107 better aria label for the remote host status bar item
ad428ea8910 untitledHint: introduce default for workbench.editor.untitled.hint
98d129e8b9f firefox: do not use ctrl+shift+P for show all commands since it is taken, make sure F1 is rendered
3cca5540aa8 Do no install repo on Raspberry Pi OS (#118826)
c4fbdc32275 accessibility: 1000 page size as default
393adbd3971 fix #118970
61e44238a28 💄 process use
393cc7f4a22 debt - consolidate process usage
cf439681f6f multicursor aria polish
ae510aec2a7 no indent after 'source' tag: for #118902
fe1264b0f2f explorerModel: add toString to explorerItem for more precise error message
094274f0d1b Don't show select default shell when proc support not registered
d1bffb783a5 Merge remote-tracking branch 'origin/main' into tyriar/118066
a4adb60e883 Add "Copy As..." core submenu to editor context and Edit titlebar menu (#118212)
11b1f937eb1 Prioritize port label from setting Fixes microsoft/vscode-remote-release#4542
2ac67ce84c4 fixes #118951
7a55f6fed7a skip failing notebook test
3f81fd64303 🆙 distro
e8c71c048fa use %~1 in bat files
c7a86c07979 🆙 distro
68a252ea778 environment - depend on product service
eb90b1c59c6 sandbox - extract IPC based file service (client) and improve runtime behaviour
f241e2e26ac debt - inline deprecated amd.ts methods into tests
8f1b7a36def sandbox - allow to reuse environment service in sandbox
1441ba91f0e environment - consistently handle VSCODE_CWD in all our node.js processes
56ee90e32e3 path - never use fs.promises.realpath
3d626dd868e Use "%~1" instead of "%1" in bat argument parsing.
640fa1af29d debt - use product service in more places
0e05a1f21a1 fix integration test
819cb01e0e0 make notebook integration test more stable, fixes https://github.com/microsoft/vscode/issues/118889
84fe402d655 Improve getting started page - Allow clicking checks to dismiss items - Allow hiding categories
e05ab31f373 Clean up styling when contrast borders are defined
a90759b5395 fix build
3006ac8e940 try out multiline extension view
5ad7633c4e9 fix scrolling body for workspace trust editor
809e11134c1 fix css for extensions grid view and settings
1a5d7f4f8ed Merge pull request #118482 from microsoft/rebornix/nb-list-focus
b81cea2a350 Fix Emmet abbreviation for Handlebars style blocks (#118832)
257fbae3f34 Ensure editorContextKeyService on markdown cell gets disposed Related to #118782
e1f84e38ab2 Ensure markdown cell editor is disposed Fix #118782
216bff57715 Merge remote-tracking branch 'origin/main' into rebornix/nb-list-focus
eac163c0611 fix tests.
c1f954ce48b optimize scroll view from bottom.
5af4ccb87be copy cells with multi select.
ad7983834af extract clone cell.
34a537bb732 sort numbers.
162d08892db Clean up
569aedce014 Mostly working seamless relaunch
7806efac02a tests in webworker EH
ffdef6b9be7 Fixes #118759: Render a separate span for each inline decoration
458904ed7a3 move cells with multi select
e545c0750b8 copy paste with hidden cells.
17beaf29fd5 Fixes #118614: Clear any outstanding state / requests and fetch semantic tokens when the language mode changes
8ca6a56d467 Try restoring ports more often Part of microsoft/vscode-remote-release#4551
d7622d392b4 change back untitled hint default to be hidden
edf387a2e8f run filename through realpath because it seems nodejs isn't always doing that, https://github.com/microsoft/vscode/issues/118812
1c9e7eb296e 💄
5a8936ae639 Lift native text file service to electron-sandbox (#118815)
1bb87db91d3 debt - provide groups merging from service and add test
0b4915dcea2 Change portsAttributes others to be its own setting
61fe79db654 Remote indicator for folders and workspaces from contributed file systems. Fixes#118813
55bfe8c2167 Merge pull request #118766 from microsoft/aeschli/extensionDevelopmentKindSimple
5109a52b2a6 explorer: use findClosesRoot in select()
3aca77c0161 Merge pull request #118777 from jeanp413/fix-118557
3eae8534747 fix #117093 update Filter on Type indicator after 'list.toggleFilterOnType' command (#117099)
9d220a95c1c Fixes #110885: Have `--max-memory` also be applied to the extension host
bd74e2fb6a0 replace openOnFocus with selectionNavigation
5f451c6670d Merge branch 'main' into aeschli/extensionDevelopmentKindSimple
1f22e55badd sandbox - share most desktop.main code
d6d2910b96b sandbox - use actual workspace and config service
1dce5d35536 replaceCells as a single edit.
ebc6eade483 update prefix sum always when edits happen
fe9466a6e1d false negative hidden ranges test
4f5824ea28b enable async tests.
3dff030ea14 delete folded cell would not change other folding states.
5e2f573d1dd cut multi cells w/ folding.
06b54543d66 Comment out a few error logs for now
498449fa8c1 Remove content version logic from webview
02d3ca91dc7 Make sure we update cached version when cell changes
544b117130a createMarkdownPreview should only create previews, not also update them
1e92de9921e Log errors and remove unused method
574740fed37 NotebookEditorWidget should not have to know if a markdown preview already exists or not
b5e22e7ed43 Remove extra log
6ea4b1cdc1a Add version to MarkdownCellViewModel
97314005fca Revert move change and disable debug flag
aeb8f3811d6 Avoid re-rendering markdown cells if they have not changed
4b9d29ae6b4 more polish and re-use extension grid
d5f47dfb885 Notebook custom markdown renderer optimization (#118288)
3635f113876 💄
b4ebf03316c selection tests.
0dcf9300ddf Fixes #118557
e9b7b5d25b8 configure extension kind of extensions under development
63d6e0c008a adopt selectionNavigation.
46fd12b0a91 align selection and focus if they were both empty
d31566b57f4 Don't include css in main katex bundle
8627fd1f883 Merge pull request #118753 from microsoft/alex/extension-test-running
a97990c9713 sort indexes in cellIndexesToRanges
919292a6742 Merge remote-tracking branch 'origin/main' into rebornix/nb-list-focus
ae4ffb1b81e Handle extension test execution on the UI
52ab2fe123f add Education extension to category constants (#118589)
ac0008a25b8 Remove waiting for welcome page while we are experimenting with what the welcome page will be Fixes #118748
8f8321d638d Smooth relaunch poc
d574f8e9163 remove duplicate code
63460db67ea Fix #118741
d5e4525830e Add comments to add java workspace tags to GDPR inventory (#117740)
1ad8c467972 Merge pull request #118574 from microsoft/tyriar/100709
5afac656035 Prevent double attach to pty host listeners
ba8f0fff7ca Remove logs
b92b610e861 mark isEmpty as readonly
f2515c57a4d Fix repository link for vscode-references-view
bc405e936fd Try new CSS grammar Fixes #115480
244428dfa7a sash: workbench.sash.hoverDelay setting
10fc457d699 💄 sash
f8ce2745c05 add stdout and stderr mimetype, add renderer for stderr
97efcde244f Merge pull request #118664 from microsoft/aeschli/extensionKindController
3fb39ad72d6 fixes #118694
bd84f143797 Merge remote-tracking branch 'origin/main' into tyriar/100709
37a826fe75d Open Recent goes to wrong workspace from remote. Fixes #118683
6af126bb3ce Move to writeSync instead of writePromise
49cad9a1c0d Fixes microsoft/monaco-editor#2382
0740b4a3134 sandbox - move platform limits to common
fdd57917f30 don't mixin default metadata when "replacing" notebook metadata
9a982d0049f fix configuration caches - respect scopes
d7854c3914c Remove unused
8788d628814 First cut of moving to hybrid getting started/welcome editor
9b2ee7fb7d9 Reduce size of Katex bundle
da3cbe74dce Avoid extra postMessage call for iframe based webviews
8fefa6aff22 Speed up mac builds (#116984)
984479d1792 Fix not being able to run a cell when it is in the Success or Error state
07d02d3e2b1 use new icons
638926d5b5d CES experiment treatment
2d7fdd82ec8 update connection state before reconnections
f3f1c131385 Update Codicons: add trusted workspace icons 1f495f5857
b1b80801806 Avoid some calls to `.then` for iframe based webview post message
5b5dd906551 Fix manually providing PAT for GitHub auth, fixes #118675
11d5e82c80c Fix any key causing shift+tab focus change
c72d7612b41 Add an untitled document data property (#115790)
371562f630b move trust color tokens and update values
e679983a3fc remove border, use color icon, use link button
1f2313b4a2d Add back custom editor test workspace
0f6d7c41eb5 introduce customEndpointTelemetryService
268c0d04a66 fix #118578. offsetHeight to include padding and scrollbar.
d1db6f0efef notebooks: update output to match NodebookCellOutputItem api
7cae7b5cedf add ExtensionKindController
a2b5e58b091 remote authority - update comments
75da06499c2 #101995 extend tooltip of menu item that defines 'alt' command (#116211)
3ac310d1cf9 Remove icon from input row in ports view
3dc05e36e15 list: anchor trait
913a5949445 cleanup debugHelperService
f1f830aefa2 Fix User tasks only working once without folder Fixes #118370
27ce1eb630f list, table: selectionNavigation option
6be4a142367 fix https://github.com/microsoft/vscode/issues/118609
8fd24025701 :liptstick: deep freeze notebook events before emitting them
6c6db188b7a polish, avoid classname.split('')
f0c44394d11 Merge pull request #118433 from microsoft/aeschli/openWindowsWithAuthority
637b659e4ad refine NotebookCell API
afe0e2b9a77 Fix regex port attributes over applying
278a41c349b Show Open Preview in Ports view for public ports
a6d7d86e857 remove `viewType` from openNotebookDocument call
da562fa27c5 Add regular expressions and "others" to portsAttributes Fixes microsoft/vscode-remote-release#4623
b3e6307430d polish
1422de11110 sandbox - move performance.contrib to sandbox
abea343c10e fix https://github.com/microsoft/vscode/issues/118369
b0f0b6125dc implement review comments
23e0d141edf Update src/vs/platform/windows/electron-main/windows.ts
d383642ba20 Update src/vs/platform/windows/common/windows.ts
78224b9b9e9 refactor perf contribution so that they can be inside electron-sandbox, https://github.com/microsoft/vscode/issues/111211, fyi @bpasero
f83b2f46dee shell env: add more logging
1d6241a8a08 prefer ReadonlyArray<T> over readonly T[]
94303f8e574 build
256ce60286b Bump elliptic from 6.5.3 to 6.5.4 (#118478)
623075e0962 update distro
a713ca6204c Merge pull request #118596 from alienvspredator/main
420f8dde79f debt - more layering fixes
f0321e30875 debt - layering fixes
9d8042db309 more jsdoc around workspace concept
a19fac2442c better docs for #118566
96fabf5cf95 fix #118591.
6d079845776 fix(typescript-snippet): fixed "newpromise" snippet
1d686afe81c reduce grace time of remote terminals (#118571)
a9087e9d0a9 Try to avoid extra promise chaining for posting into a webview
cbacbe647c3 Fix markdown preview still being rendered while in edit mode
54f30ed19ce Lock to commit rather than tag for Azure login action
3244facbbbe wt editor stepping stone - make extensions list better - centered header style
d4ee684c8de testing: show progress in status bar, minor refactors and cleanup
80112e79ffb testing: show total number of tests to run
5b41604444b testing: add more logical default autorun behavior
7a9e144ee15 Fixes a listener leak with ILanguageSelection
57155e84203 Fixes #118195 - avoids update if already set
bcb8c8a4f4b Remove notebook document runnable metadata #106747
8454701b67c Update test for api
225a8c2b89d Infer cell "runnable" from notebook kernel state Fix #106747
7a19d09047d Begin eliminating cell runnable metadata
d1164661d29 Fix markdown edited cell height on reload
c77e5ccd947 Add back top margin for webview cells
d299be88ea6 Updates proposal for #116906
556e6d8310f Fixup search smoke tests
58bd8e075a3 Fix spelling in comment
ba54c76164b Use TS replacement span if returned
724bc08f906 Remove log
f2d687752c9 Create a new pty ready promise on relaunch
65e4309c0d9 Directly expose environmentVariableInfo
37c54c79e0d Fix compile
7f94f0d97c2 Move some ptyProcessReady usage inside proc manager
3cc479953ca fix #117718 fire onDidChangeResources event after unregistering group
a7c9230fb33 Update distro
d6f4353fae4 bump distro
9eceb504987 Move label about for #115244 after more tests are failing
f8a6f90dea7 Revert "chore: bump distro"
e5a10ca55d6 Skip search tests while diagnosing flakeyness
88655de6104 Adds logging
6922f6150d8 xterm@4.11.0 Diff: https://github.com/xtermjs/xterm.js/compare/a73fe62...4.11.0
79e2119c5e6 Revert "snap: set compression to lzo, #117852 (#118116)"
43ced8a10a3 chore: bump distro
0f042b2c856 fix https://github.com/microsoft/vscode/issues/118569
0e43220113c finalize telemetry enablement api refs #110267
95d3c1e63b7 finalize isNewAppInstall api refs #117058
e60b94d6e9c Merge branch 'main' into digitarald/ces
6438e0564af Add 'Marketplace' as option for file on and remove as top-level type, #118473
17c67963f32 api work snapshot
112bd090027 Queue file operations
4ee2ef41e5b update cache on reprocess
0f64ef1b655 remove NotebookDocument#contentOptions
f0cf34e073b debug: do not bind F10 to step over when on web
eaf4a6a91b7 Fix debug console URI being decoded (#118226)
417b7803a18 Update distro
2c11dafcc2f Merge pull request #118252 from microsoft/tyriar/116467_2
dc92ff53548 Set distro back to that in main
4bb960ade60 Merge remote-tracking branch 'origin/main' into tyriar/116467_2
b02e102f480 untitleHint: use expereiment service
90efd0a81aa Update README.md
449158a1aa7 Some Ports view cleanup
b8a320867e5 allow null for remoteAuthority in IBaseOpenWindowsOptions to force local window
637497076ac Update distro
1e7fbfa7674 Merge remote-tracking branch 'origin/main' into tyriar/116467_2
e7b0596d89a Revert "Comment out notebook compile error"
aaf6287eccc remove skipped test
e96f0ea3700 todo-tag
7bcec044268 Comment out notebook compile error
878526839a3 Update distro
364b9e98e83 Merge remote-tracking branch 'origin/main' into tyriar/116467_2
ab9e11f38e6 Remove resolved comments
e2ba7c6ae30 Breakpoint inline edit button should be a submenu
27efd88041d Remove preconnection terminal concept
4db71714ebd Properly dispose everything in tunnel view cells Part of #118544
9cc276648eb remove onDidChangeCellLanguage-event in favor of the existing document closed/opened event sequence
55af8021a12 Simplify RemotePty, revive shell config cwd
e373b9c59e2 Focus row when escaping input on Ports view Fixes #117771
3c96cb6254a Merge branch 'main' into aeschli/openWindowsWithAuthority
99e97da512b revert unnecessary change
d1dbb93317a Remove remote test failure comment
6d01ad952a9 Merge remote-tracking branch 'origin/main' into tyriar/116467_2
e15767f6dcd add comment for remoteAuthority
5ce792fcfad Add SECURITY.md
98a22a957a2 declare cancellation support for openNotebook and wire it up, exempt notebook content provider from provider naming rules
0e04c15de4f assert unsetting of active notebook needs null, https://github.com/microsoft/vscode/issues/118470
bcfcb539ab5 unit test for https://github.com/microsoft/vscode/issues/118470
8c436826ae5 Merge pull request #118471 from DonJayamanne/openNotebookBug
30d699fa104 on fire active notebook change event when something changed, https://github.com/microsoft/vscode/issues/118470
425316c3764 Add a compose language (#118042)
63be79e67de Merge pull request #117062 from NotWearingPants/bugfix/rtl-cursor
edfbf27e3af #118443  - change name
fa6d38a99b3 change nls ids
9d3a1d9f59c Fix #118443
6b76fcb671e Merge pull request #118468 from spetrescu/main
7d96db1e51b Make underlined link buttons blue to match the styling of similar buttons
27975dad4fb move to IProcessEnvService where appropriate in default shell logic (#118271)
ac229ced073 Revert "Reenable smoke test to see if still flakey" #115244
09c3c2d3be4 Remove broken part of test
11a84a6e8ac inset -> output.
b62e3c7d1db Update distro
5fdbc82111f Re-enable task and term test
9878ccfbd74 remove markdown preview only when it is hidden or deleted.
250c7baf7e8 Fix #117903
c870a55b708 Update terminalProcessManager.ts
8fe29a7c415 Uncomment in test
30f41631849 Skip the failing test for remote only
d89e8cd27ce recent entries with authority
c59c1101162 revealView should scroll a little to reveal items below viewport.
d4f8348c6ac Handle undefined extension publishers in issue reporter, fixes #118480
61301530c69 revealView should scroll a little to reveal items below viewport.
23ad719498b Log acceptTerminalOpened
bdbf5850127 Bump vscode-emmet-helper, fixes #118363
0e8fba32637 Add outline offset for view actions (fixes #117349)
9b1700a8291 example of notebook specific navigation commands.
2c1037d3521 Fixes #117600 (#118397)
b20839c1f3d Add 'Marketplace' issue type to issue reporter, closes #118473
a8739f9c3a5 Change messageDisposables to DisposableStore
2b9470cb4e1 Clean up SearchView link button code
31a7757fc7b Better "Open Settings" option in search view
18f16643ead Add button to reenable search excludes Fix #115352
244e9e6e793 set remoteAuthority in NativeHostService.openWindow if not yet defined
1761ecec3bd reduce selections.
b6b9aa15ef6 debug: allow passing partial config to start debugging command
221e20b3742 Re-enable, add some more test logs
7e6d4c5eb91 debug: fill in selected configuration by name if not provided
3f56118e7bb move cell up
a39e7343653 Oops
584999658ee Bug
820f0eeb270 Fix tooltip not showing for codelens extension
a0c8d41f9ed add notebook navigation commands
78cb4cfc32b improved comment for InlineValueContext.frameId
3df01b4ae74 Include ms in shutdown constant comments
45c032da7ab Skip the failing task test
1469a82540f fixes #118006
d8a7202293c Update distro
e22c2be14d1 snap: set compression to lzo, #117852 (#118116)
03c8548523f Merge remote-tracking branch 'origin/main' into tyriar/116467_2
9022c7fa945 Update distro
f2cfdcf19b8 Bump distro
4a82fbab162 Don't force create a terminal on no reconnect
06044789bfa API proposal for PortAttributesProvider (#118446)
3f778f6aebf Update distro
9c78fa40ca7 skip failing test (#118443)
20b19612917 Move proxy resolution to vscode-proxy-agent (#117054)
b41b95faee9 Pin windows-process-tree@0.2.4 to match main package.json
4d3b1580233 Disable terminal tests in remote again, fix settings for tasks
1cd624c12a3 Merge remote-tracking branch 'origin/main' into tyriar/116467_2
4abc244a97e Add windows-process-tree to remote deps
c2a92a1ba67 Merge pull request #118418 from microsoft/ben/sandbox
caed3ea183a Merge pull request #118269 from davidanthoff/julia-indentation-rules
007baec8d51 fixes #118214 (#118425)
c187999ee44 Merge pull request #118310 from smorimoto/ocaml
2a0f9aa8dc7 Reminder to compile between tests
69d36e8c982 Fix transformToSnakecase
305456c873f bump distro
f7274905565 editors - fix mergeAllGroups (#118268)
8c3a00f78cb allow debug textmate in sandbox (#118219)
f74d3b2fc75 fix tests
0c17e384499 sandbox - migrate backups from md5 to our hash algorithm
dbe9dd49675 sandbox - make signing and integrity available
3f46e7f7b59 add ui flag to mocha tests
74532eb261c Re-enable process unresponsive checking
5cc1775bbf0 Disable unresponsive create process
11897d00a7a Disable pty host listeners temporarily
074632a51f1 Try enable remote terminal integration tests
508fcfbb537 Add more OCaml related file extensions to the OCaml group
5d80c30e5b6 Reenable smoke test to see if still flakey Ref #115244
74014e7fc6d Fix #117251
fe79bb261fb Add defaultSnippets to getting started contribution point Closes #117476
2d5e9cae4e0 💄
d3086eaa8c5 expect commands to set selection and focus for us properly.
7707feab17b accept focus from the list view.
6e83ba82107 fix #118279
da79b9db816 Don't setup pty host listeners twice in remote
ea5f05a4358 Trying to clairify how webview options are used and passed around
e066c74761e Document new fixedChunkSizePolling ts watch mode
d7d42534260 Mark field as readonly
a01035c44f8 Pick up latest TS 4.3 for building VS Code
02a5d5925ba Disable relaunch in tests
755fae50ab5 Bail out of create process if it's been disposed
2d3f1a0b478 fix #117699
258ee03bfbe Update distro
3483e9541b2 update betweenCellToolbar actions per context change.
61ea6ad847a Remote shell type support
fc677cb3220 fix #118273.
c40b367840d Merge remote-tracking branch 'origin/main' into tyriar/116467_2
b15bbfa8516 More test logs
3e345101dfd update shellType when it changes for local windows terminals (#117998)
6b2daa9a897 Update distro
ff09362f443 Merge remote-tracking branch 'origin/main' into tyriar/116467_2
5d5fa588828 Support pty host management in remote
29b1fcffd1b fix #117684.
7af259ab841 Add logs to test
c24bfc336c2 💄& localization
daf840b9293 Revert "fix visually background flash of cells."
016b809eef0 kill terminal process on ipad (#118247)
c18378655bd Add Julia indentation rules
7f7e427d3ba fix visually background flash of cells.
f704f80f877 Pick up TS 4.2.3
22cb8ccdac3 Merge remote-tracking branch 'origin/main' into tyriar/116467_2
a7d9285b89f Update distro
2e68f2ae918 Better fix for #118235
00d3831d0c7 fix #118248.
59972ff745f fix build
5144d664926 dedup ansi color rendering.
bba6d12ccb2 💄
ff5da2ff172 DOM.show/hide.
d2e39d0ae09 use resize listener for all main frame outputs.
32f7c1d93a8 Don't assume uncompleted category exists Fixes #118235
ccb3601d552 Support term cli commands
c2e3a4cdc67 Update distro
af0ec1caa0b ctrl+c on ipad (#118243)
6799395da0c Revert "fix #114009" (#118242)
dfbc5374637 Increase local grace time to a minute
fe24a792b03 Support attach to session in local
f916e9f1aba fix #114009
df6b2691705 Support orphaned processes
48be13acf8e Check if VSCode runs serverless (#118233)
e518e533653 Share IOffProcessTerminalService
51e773e69f2 Merge branch 'main' into aeschli/openWindowsWithAuthority
0bcba0486bb Make setTerminalLayoutInfo interface consistent
7703dff5fc1 Clean up, bring local remote interfaces closer
92ad349125b fix typo in comment
aadc16a2371 Simplify channel comm
230e0fdc9aa clean up, some ground work to support viewColumn, $acceptEditorPropertiesChanged must update all state before sending events, remove active notion from notebook editor
9516844abfd use TS typle naming feature
68a6f1c30e4 look up editor by id, slimmer dtos
f7ff53d7b06 Remove `_wrapWebWorkerExtHostInIframe`
418b8248e43 Progress towards sharing local and remote term impl
25dc50c18ed Remove start-up timeouts
49b5e3ba0ae bump version
978d1399f54 Fix compilation error
fca9c7f78fb Fixes microsoft/monaco-editor#2375
5931e598b10 Fixes microsoft/monaco-editor#2344
205ec8c5f2d Fixes microsoft/monaco-editor#2358
b2a0913ad23 Fixes microsoft/monaco-editor#2168
9748b5f3c0b Fixes microsoft/monaco-editor#2359: Avoid syntax that confuses webpack less loader
5c4663baadf Fixes microsoft/monaco-editor#2355
60222b710d4 Align `MultiEditorAction` with `MultiCommand`
453e2793b2b Prefer using TS constant defining the context key
04770364fdc #118222 skip failed test
1260de1c101 sandbox - move workspace tags to sandbox
17212ee46f8 #118199
c024db9f419 NotebookEditorSelectionChangeEvent should contain selection ranges, not cells
2e84eb92077 explorer tests: use strict equal
1e28c1ec7ee debug tests: use strict equal
1a9df6127cc fix smoke tests
ef6d44f53aa debug console shouldn't collapse messages when they have different source locations
6e5e1e700b9 api todos
6117524374f make NotebookCellData and NotebookData classes, rename NotebookCellData#cellKind to NotebookCellData#kind
86df4442128 remove todos
3a21f7815c4 Merge pull request #118125 from microsoft/sandy081/keybindingsEditor/adoptTable
57aaafc72f3 Do not check for settings sync enablement while initializing in web
d4b5298cd62 -add bg color to even child - clean up
997c9f29307 add showNotebookDocument overload or uri
ae2f3e07e12 streams - add test for using error as data
be70750f862 comment 💄
b65719bfa27 streams - require explicit end() after error() and remove error support from end()
188e6aac851 stop the code bunny, reuse the createAndFillInContextMenuActions-util, fyi @sandy081 @rebornix
7386525c683 remove one more occurence of '1_run'
bc62648b05c Revert "Remove authentication provider package.json declaration"
fead22bae42 bump distro
eed8a79e81f Extract proxy agent support (#117054)
79096af4755 use CSS for odd styling
223f4f820f8 multi cursor: announce cursor changes
3b05017bb8e more 💄, more strict typings
1d8493b203e 💄 in mainThreadNotebooks, return types, more private, dispoable store, duplication removal, etc
81edf8b91ab Merge pull request #118071 from mtaran-google/main
85c1a17b60f Merge IEditor and INotebookEditor, move editor things into notebook editor service
fc785836967 fixes #118006
d84ddcbd529 Open window with authority
39c1d680867 #62531 clean up
2dfc39c6949 Remove arrays#mergeSort because by now browsers support the refined sort spec which mandates `sort` to be stable.
587274078c1 remove NotebookDocumentMetadata#displayOrder, https://github.com/microsoft/vscode/issues/117684
3e8b0eb2d4f remove displayOrder from NotebookDocumentMetadata API, https://github.com/microsoft/vscode/issues/117684
afae25919a8 Merge pull request #115351 from gjsjohnmurray/fix-62531
fa37b721d1e 💄
ddb17dc1282 💄
dbbf2b16882 shell env - introduce a service to resolve shell env as promise (#108804)
bd2b229870b debug: update js-debug
567b82a0f9c Reduce padding of new markdown cells in notebook
38ac13bc833 Slightly reposition the folding indicator for cells
99f2b830a1d Improve drag and drop indicators for custom markdown cells in notebooks
354a0a2620f Disallow dragging the outer markdown cell for rendered markdown cells
a34ed4b0d7b Make markdown cells span full width of editor
60d600b3661 Fix showing wrong name for files in search after rename Fix #117778
1c7ced625a3 Update dimensions of webview element when it is shown again
72995bcb80b Mark property as readonly array
28b7345808b Improve documentation for WebviewService
9fa1800b979 Make the webview icons manager disposable
5bff5459d13 Move webview icons from generic webview service to the webview workbench service
acdcb64a6c9 Throw error if a webview is double registered
487296741f5 Don't  require lazy webview to be passed to WebviewInput
344f329dd42 Make reviveWebview take an options bag instead of parameters
79ff1ec91bd gate on feature flag
aca4cb12985 workspace trust telem
0f975049421 Fix output padding/margin for diff notebook editors
9f395ddb934 Update Codicons 7e0f377891
0eca51a2dad Mark selected markdown previews in notebooks (#117947)
191d3324132 Add offset to button focus (fixes #117909)
8a81f4149d3 add warning log if webgl cannot be loaded
6abc478020f Update src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
8b1ddde4f5b move disposal to end so measureRenderTime gets called
920b8b31931 store suggestedRendererType to avoid retrying webgl if it's thrown an error unless the setting gets changed
e9a748131c1 use storageService
bab447271a3 measure render time if webgl throws and canvas set
b619d92639d use canvas if webgl throws
e7ce70318ff after webgl is disposed, don't retry to enable it unless the renderer type gets changed
ca83d009f37 Update src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
d61adbfd923 part of #106202, make webgl renderer default, using dom if loading the add on throws
1e5e33cd023 testing: fix unit test err
d6b3bc68f1e testing: move types to classes instead of interfaces
35aed337263 testing: improve RequiredTestItem api
1370dacbe0f Rename localPtyService to ptyHostService
05ccfc4fcb7 Move localPtyService to node
db06103f1bd Enable search in open editors checkbox by default
597c5958527 fix overflow in command column
0150b020a10 Merge pull request #118121 from microsoft/tyriar/116467
2d4e671f730 update distro.
5b2865bc99b fix layout - do not consider header height
c6202bb3cc5 Adopt to use new table widget
dd3f3f9d7fe Update issue scraper to use standard bot PAT and run every month
8465489bbd4 Fix unit tests
8fd1b977166 Merge remote-tracking branch 'origin/main' into tyriar/116467
12ab47ff863 Fix compile
c9ae209c80e Use safe process env from electron-sandbox
97cb1ff41d2 Register ILocalTerminalService
468d73edeb0 Fix compile
306bebf0f15 Move responsiveness check to local terminal service
3a1f4c402b4 Move terminal instance service methods to local terminal service
df863f912b3 more context key doc
5ba5f986b92 remove notebook dependency from build edits
128e9b502d2 add frameId to InlineValueContext
cb7ad05cb7e Merge pull request #117766 from microsoft/tyriar/remove_flow_control
73fee061714 Update distro
9bf3a06e647 Merge pull request #118118 from microsoft/tyriar/117990
68a3a7bbf9b improve comment
0ef6619a3eb services - use refineServiceDecorator for environment (#117881)
1e0d5009b5d fix exception breakpoint padding
03681b39a50 Update distro
fa4c3c6cf1e Show ports badge on view, not view container Fixes #117904
a5c28d0ca06 Merge remote-tracking branch 'origin/main' into tyriar/remove_flow_control
ddd6fccfee0 services - use refineServiceDecorator for layout service (#117881)
ffa703d4805 Recover on pty host reconnect
c0f6549d1cb files - address #118060 on master
94dec183740 Fix simple file picker not opening entered value Fixes #116858
7586d1a0fc2 Fix extra http on some forwarded port addresses Fixes microsoft/vscode-remote-release#4595
fb46801cf2f lock file-changes-action
dd14e280254 Don't use an icon on the Port add row
c2a2cc2bc3b Allow quick input to show info severity (#118032)
179c89852f7 Change icon for npm scripts view Fixes #118019
3c238e71dbc Add "hasPackageJson" check back to npm view and let it find files in directories Fixes #117950
1d46693af84 fix IThemeService decoration ids. For #117881
31012ea2d4a add refineServiceDecorator, https://github.com/microsoft/vscode/issues/117881
978b0d6ead9 context key doc
16ea2f2894b remove "getter" wrapping for proposed API types (classed, enums). These checks needed to be disabled because of an TS issues
f79a0df4dbe api todos, remove long outdated proposal
01d775756c7 todo goes issue
b6141474a76 move undo/redo and clipboard support out of notebook service so that it slims down
c349764ab2e no graceful, throw errors when trying IO on notebooks that have no provider, move notebook model things together
069da883da5 Merge pull request #117834 from jeanp413/fix-panel-codicon-outline
8025d97ece8 mark `displayOrder` for removal, https://github.com/microsoft/vscode/issues/117684#issuecomment-790019754
73c01a5dd87 Merge pull request #117424 from atscott/dedupereferences
f43fcbe6a4e fix https://github.com/microsoft/vscode/issues/118103
62d6a24efb9 revive URI when receiving them, fixes https://github.com/microsoft/vscode/issues/118085
0657df6e82f fix some area labels in extensions and scm
534e2306379 Renaming a folder adds it to history (fix #118080)
2ba67b7b075 Allow ripgrep search provider to work for files backed by file scheme, but not file scheme themselves (vscode-userdata) (#118069)
5f17dc2a596 Ensure that PrefService calls openEditor with a proper options object and add tests Better fix for #117952
54758b7e16d Revert "Ensure that PrefService calls openEditor with a proper options object and add tests"
2ae55bc7164 Ensure that PrefService calls openEditor with a proper options object and add tests Better fix for #117952
16c94f18258 Remove incorrect command
a4b2541e379 Mark disposableStore property readonly
584d2338870 Use `_register` for disposable
538931e7906 Make sure context key listeners are disposed of
49d05f998f0 Add `CodeActionTriggerKind` api proposal
20f06e04445 Clarify docs on CodeAction return type
7e18b7006d0 Use generic type for CodeActionProvider
ba117e60c20 fix #118043
4bd99a42df0 Fix old markdown preview not being removed on drag
4371e72fb6a Fix potential null exception while dragging cells
abf99de040e 💄
aaf70523a8e Bump vscode-emmet-helper, fixes #118008
828f99eff55 Update diff editor with new webview options
e56182e67f2 Make the backlayer webview span the full width of the notebook editor (#117948)
bfa7822f703 Fix typo in IWorkbenchExtensioManagementService
e9533c22fee add basic workspace trust unit test
19b7444ccf0 fixup! fix microsoft/vscode#117095 de-duplicate location results
17f63a649ec testing: update to more proper provider api
2f7438f492f Fix spelling for type
5d5b9dd0a8b Don't label non-editable custom editors as readonly
5f24ec84ac7 Use correct new context name
6949fed6ed2 Update grammars and fix julia update script for Windows
0e94794c9d0 debt - remove unneccessary indirections from notebook service
09149ac0930 Avoid double dispose of pty host client
f80f0d7074e More forwarded ports trace logging
65c0eeb03d0 fixes #118006
a24cb4615a1 debug debt: remove unneneded check
341c130b0e9 call stack: get rid of actions, menus everywhere
fd948827992 Deprecate editor.accessibilityPageSize setting
79cf4e92ce1 Use Promise instead of event
14fd07d57a2 Workspace trust api feedback
65a9aa17768 Use "(Settings) " as a prefix for userdata paaths in web Closes #114979
c3d7bd2269d Reserve space for recent list to prevent shifting when it loads Fixes #117628
e21f3916af7 Focus first uncompleted category rather than whole document on start Closes #117540
09dae2618ae Disconnect in debug toolbar should dispatch to root session
8c13b011133 debug: simplify registration
b6f87905932 💄 comment
4def740615b wrap perf stuff in iife, https://github.com/microsoft/vscode/issues/116546
bc444ac3797 Fix #117869
bede292addb Error on `remoteAuthority` in Local Workspace File. Fixes #118023
6b3313141de make sure local dispoables are disposed and cleared, https://github.com/microsoft/vscode/issues/117675
d13b7ff3641 one class, one variable style, https://github.com/microsoft/vscode/issues/117675
2e9fde23fdd add todo-tag for InlineHint, https://github.com/microsoft/vscode/issues/105690
0a49559a443 Mitigates #118008, better fix TBD
a795f49b097 more enforcement of readonly nb doc.
62cfd68c779 absolutely no polish POC feature list
d82bb46c445 do not prompt for confirmation in editor
ed94b5d7562 allow text selection of description
6979a39169a move webview resolved state internal.
c113b806cca re-organize notebook editor widget methods.
1614e28a11c remove notebook editor widget methods not used.
c70fb23a27b 📓 move decorations out.
52bce12c25e testing: fix up wording in api
25b5db4d55c testing: make workspace test hierarchy required
94cda08af53 testing: make runTests required
9fbc8811428 testing: make hidden state more clear
2cc1a8061d1 Fix VSCode spacing
cf3faa40460 Don't relaunch extension owned terminals (#117987)
6c6caf678fe Don't force kill ptys on Windows on window exit
7b91cd85284 less exclamation
6643b5e520b de-dup: uri.
0eb8c53f90b de-dup, NotebookEditorWidget#willDispose, didScroll.
623741272a2 Add activeCustomEditorId context
08ceea18aa0 rpm-spec: fix the wrong claim about working on EL7
e3829dc2477 Add 'prune' option to fetch in git extension API (#117923)
975dfff6db6 Emmet: Change the type of emmet extensions path (#117946)
cc5db258239 testing: fix NaN if 0 tests ran
fe353a54240 testing: close error peek view when test run starts
7d1751444b2 testing: fix tree view overflowing container
b6251fc0baf testing: fix 'run in current file' running all tests
da98cc6e94d testing: fix run at cursor discovering indefinitely
7c1305782b1 testing: adopt new autorun icon
4a6488c6d03 Move kernel/execution code out of NotebookEditorWidget for testability
b629d888ca6 Bump Emmet yarn, fixes #117154, fixes #97632
5073e6f1fe5 fixes #117968
f97dd62ece6 Make sure we use the cannonical uri for file move target
1155803d134 Use case-insensitive check for file extensions
bb8b693479b Mark properties readonly
20ec5b80085 Reuse generic open with logic for custom editors
75b5207f850 Extract BaseToWebviewMessage interface
4e4c43f30fd Update distro
e994e5ab498 Persistent terminal id -> Persistent process id
647773d7e68 Rename terminal id to instance id
88d9e2b46b7 Refactor second task test
f8c41a80b0d Refactor first task test
c8fc575275d Ignore terminal events not related to task test
e62bf133c45 fixes #117575
15c02651811 use one element for focused/active item in actbar fixes #117584
cd9ce538ba5 Add shouldPersist terminal tests
c6d6bda7197 Merge pull request #117974 from ko1/patch-1
20096095f19 fix extension readme not rendering img width height (#117961)
2b50ba174f3 refs #117960
5d4377de987 March for API issues
72de8e9be86 add region markers to isTelemetryEnabled proposal, https://github.com/microsoft/vscode/issues/110267
ff225b9fcce add telemetry enablement api (#117944)
4de8cb29073 increase accessibility page size to 2000
9692037daa9 Update vscode.d.ts
9e4520310ed Fix remote terminal reconnect
85cbc2bc7ce cancel parameter hints when editor blurs, https://github.com/microsoft/vscode/issues/115265
44955421ae7 fix https://github.com/microsoft/vscode/issues/117431
7bc94131f17 change anyScore so it repeatedly run fuzzyScore on substrings of the pattern, https://github.com/microsoft/vscode/issues/116683
0018625d00e more details in explain dialog,  https://github.com/microsoft/vscode/issues/116683
e2c5ff9db00 do not auto open pasted file
2022aede921 Return early on promise reject.
ed1118b27b1 Support empty messages during location import
58ab537f4fc Debt: descriptions/hide context keys (tree, ports, tasks)
66b7ffaabf9 simplify  $tryShowNotebookDocument further
65e28321240 use label service to infer name of notebook input
83f40886812 notebook - simplify group/viewColumn handling when opening a notebook editor via API
df8763cfff7 api todos for notebook cell
be11cb2de00 disable failing test (#117446)
f70433a596a fixes #117910
73f9f126fb2 fix tests
932c7e247dc 🆙 distro
8c1bfcb569a services - distinguish environment services (#117881)
5510ee9c51d services - distinguish layout services (#117881)
6c13c8f4ed2 de-deup: getContextFromEditor.
9f7d229461a Extract decorateFileEditorLabel to a common function
d7f90c7dbcf re #114554.
d9d5e5d9c38 Merge branch 'main' into digitarald/ces
e3bc5abc511 Draft for ces survey
400737c5b89 Pass 'data' to completion details request (#117092)
5d6ea08985d fix #116751.
01025340392 Splits clone/docs welcome Allow GitHub Browser entry in the middle
015ca030c4b tests for selections for navigation and hidden ranges.
177e3474c5a consolidate index/handle update api.
1f08b8f9024 wrong use handle/selection
460ebdaaf5b Aggregates welcome view registration by view id
9d071596951 debug: bump js-debug-companion version
811dc8d45a0 Remove authentication provider package.json declaration
8e37e4722ec Fixes #74505 (#117807)
5aeafe2b209 Fix Emmet issue where incorrect abbreviation is displayed in an html document (#117759)
b3ade044793 fixes #117924
0c9476a0b6b testing: fix tree not updating if nodes are replaced with same id
f18a3400668 Use method instead of event
c30e2d46b2a Fix emmet update extensions path issue (#117797)
e4a69193d04 Merge pull request #117138 from shskwmt/fix/116822
a13f7ee916b actionBar: home and end should navigate to first and last item respectively
721514f2c1d Merge pull request #117832 from jeanp413/fix-117354
98883cf3b11 remove actionBar.reverse orientation
0bf5569f02c seti: use CONTRIBUTING
c3e2c76f762 add failing, skipped test for https://github.com/microsoft/vscode/issues/117899
edadf1c7194 Implement shouldPersist for all terminals processes
884ed1e3f33 Use initial instead of unset
b803df2435c Fix top shadow issue
3559e47c08d update gulp-tsb
bf894811515 Some Ports view clean up
73112daff11 Remove extra check that is not needed
e9166375289 tests - enable color output for integration tests
32b3afadcbe support to make N outline entries from 1 cell, https://github.com/microsoft/vscode/issues/115200
85588252af1 notebook - make outline entries use the heading text has preview text
b139c10f9a8 add tests for notebook outline
de020f04d13 debt - make withTestNotebook easier to use
a04913af757 Merge pull request #117716 from microsoft/tyriar/115396
d5eeb40b557 better focus for select boxes in action bars
a2bacaf9fc3 Reverting the top margin to avoid a regression
e4e9d1f43b2 Fix grammar
1c4daf4886c Merge pull request #117842 from TranquilMarmot/main
6a864f0b679 Add line height for title
ba83910eb76 Remove duplicate tooltip
8baa0ebc750 Fixes title casing
36b0a209a51 backups - consolidate web and desktop strategy for backups when auto save is on
b44cc868901 Revisit loose primary group check , use string instead of isPrimaryCheck
12675b4797e missing await
19aee3b6ddf untitled.hint let's go back to the button as the default
6dc076b5c4d debt - tackle an old todo
aacafc75b37 debt - use CompletionItem#textLabel in more places
f5153bbdacd use CompletionItem#textLabel
3c62a8f898b tabs - track last tab in row for wrapping
de50318b48f text files - open an editor that fails to auto save (#115840)
b497d17fec9 View: Maximize editor group" doesnt work with dragged file between editors (fix #117686)
3aff1320b81 my work for march
b99df4f2b6e don't pass model service to applyEdit but check model version for edit that come from extensions, fixes https://github.com/microsoft/vscode/issues/117683
8fd4a68845f Factor in workspace trust when switching versions (#117774)
f84aa806e45 🆙 distro
23dca79e8e9 🆙 nsfwatcher (#117871)
0a7ea106e6e Merge remote-tracking branch 'bpasero/ben/march-debt'
f3ec084d542 Update seti-ui icon theme
b061ac534cb Fix #117833
f3f4eebecbd Label custom editor as deleted if the backing file is deleted
64db4d5a1a5 Fixes #117354
d89e2e17a5d Allow single line comment after `{` for auto indent
5766526b0b3 Port the desktop iframe webivew focus improvements to the web
8572664c6c7 Enable semantic features (such as error reporting) in JS/TS notebook cells
a74ebb17cfe Add helper for tracking active js/ts editor
1f567e10f37 Fixing two more cases for promises in conditionals
3feb2ece1ed Pick up latest TS version for building VS Code
5c7c41fc3d2 Merge pull request #117723 from microsoft/rebornix/reduce-markdown-flickering
91d73da5e42 Only show `infer return type` refactoring when refactorings are requested
d596c568451 fix altClickMovesCursor setting description -> markdownDescription (#117793)
a4187782439 Merge remote-tracking branch 'origin/main' into tyriar/remove_flow_control
d0a46a03279 Merge pull request #117734 from jeanp413/fix-117682
ba9c72b1ff7 Merge pull request #117762 from microsoft/tyriar/remove_ext_host_proc
cadb56785ab Merge branch 'main' into tyriar/remove_ext_host_proc
e0b4ebc148d Merge remote-tracking branch 'origin/main' into tyriar/remove_flow_control
f4c1da9ca64 Update distro
ce4bbc7a19e bump version to 1.55
abdf5767046 ipc - allow to configure proxy
c41922bf427 chore - cleanup registerSingleton service usages
91a246998c2 Remove flow control setting
bd272ea6b74 chore - have a single display change listener
1f0f03e4a03 ipc - adopt utility methods (#114418)
df5d7c257df Remove exthost terminal processes
5f234672f57 fix: only use the readonly attribute on the IOS
509cd79dbd6 text file model - drop custom touch method and just go through normal save code
437904db063 file service - add a atomic read option
45f5c4d43f0 Fixes #117682
3d988a6800f Remove focus handling on the xterm element
9a9551b89fc pfs  - copy should preserve dangling symbolic links
1e799f5a17e anything quick pick - only restore editor view state in certain cases
acea3970993 workspaces - use recursive mkdirSync
a469f5eafaa storage - rename storageservice2 => storageservice
2ab5a60c0b8 storage - drop old node based storage service
5fabc0d9dc1 smoke test - remove code only needed for stable january release
f5d9bdc8466 fix microsoft/vscode#117095 de-duplicate location results
4cda94b60c1 Remove escaping whitespace characters
495c0e996ad fix cursor position when at the start of RTL syntax tokens
234c7a45fee refactor change to fix fault and reduce diff
bf426c250ec structure FilterOptions.textFilter to hold negate flag
03ad36a18b6 Fix negation logic for filterResourceMarkers and filterRelatedInformation
878b0087e06 simplify negate logic in filterMarker
5a6c46fe60a fix #62531 support negation in text filter of Problems
490d7e38da9 Merge branch 'master' into fix-95671
057a47c1b62 Merge branch 'master' into fix-95671
8b73103dedf Merge branch 'master' of https://github.com/matthew-haines/vscode
ac89d9ef71f Fixed logic for setCollapseStateForRest and alt-click in editor
9e1b929816d Fixed logic for setCollapseStateForRest
330f6052ebb Added actions for folding/unfolding all regions except selected
8ef113d399c Added collapse surrounding regions with alt-click
3374969a2cb Fixes #95671
REVERT: fd6f3bce670 chore: bump electron@11.3.0 (#118680)
REVERT: 305bf142199 Remove icon from input row in ports view (#118649)
REVERT: b5af426d34c Properly dispose everything in tunnel view cells (#118546)
REVERT: f299ec03c2a Fix extra port icon (#118529)
REVERT: 62dbffbfe91 Merge pull request #118177 from microsoft/joh/bump-version
REVERT: 062c67a3210 Merge pull request #118491 from microsoft/env-var-recovery
REVERT: e11b6a730c9 Fix #117903 (#118492)
REVERT: e7936a3e885 prevent env var relaunch from extension owned terminals
REVERT: 3be37a725d6 Merge pull request #118438 from microsoft/tyriar/1_54_117990
REVERT: d461d2fd311 Merge pull request #118265 from microsoft/connor4312/candidate/js-debug-1.54.5
REVERT: 88b4d3f9a4e Merge pull request #118448 from microsoft/tyriar/1_54_118321
REVERT: c48a57b6988 Merge pull request #118437 from microsoft/tyriar/1_54_117956
REVERT: d68ab8fc717 Don't force create a terminal on no reconnect
REVERT: f9e6b352d1c Recover on pty host reconnect
REVERT: b31f6e1afea Don't force kill ptys on Windows on window exit
REVERT: bd655647d79 fixes #118214 (#118425)
REVERT: 3a6b7f7cbdc editors - fix mergeAllGroups (#118268) (#118406)
REVERT: 06c5e24837e FileSystemProvider extension: throwing a FileSystemError in readFile does not report to user (#118173)
REVERT: 61feeef2289 Renaming a folder adds it to history (fix #118080) (#118174)
REVERT: dd74fb1d885 debug: update js-debug
REVERT: 362f7e441ff Pick up TS 4.2.3 (#118261)
REVERT: 6b7199812b4 Don't assume uncompleted category exists (#118250)
REVERT: 21ea885f455 Merge pull request #118167 from microsoft/connor4312/candidate/js-debug-1.54.4
REVERT: de16aa4bae0 bump version to future 1.54.2
REVERT: 87ff6fb52f1 debug: update js-debug
REVERT: f30a9b73e8f bump version (#118144)
REVERT: a25525922cd update distro (#118129)
REVERT: 42e27fe5cdc Merge pull request #117982 from microsoft/roblou/settingsOpenEditor
REVERT: ac575425edc Ensure EditorOptions subclass is passed to openEditor Fix #117952
REVERT: 911868fa126 refs #117960 (#117976)
REVERT: 62c69b32bf7 Merge pull request #117972 from microsoft/tyriar/r_1_54_remote_reconnect
REVERT: 564f3917935 Fix remote terminal reconnect
REVERT: e7989863202 fixes #117924 (#117925)
REVERT: c4d7a739c9b Terminal cannot input (#117915)
REVERT: 5266d3cc7f3 Merge pull request #117898 from microsoft/tyriar/r1_54_remote_reconnect
REVERT: 6f0e457db3f Fix emmet update extensions path issue (#117797)
REVERT: 66c7b551727 Implement shouldPersist for all terminals processes
REVERT: ae03e39735b Only show `infer return type` refactoring when refactorings are requested (#117800)

git-subtree-dir: lib/vscode
git-subtree-split: ead2c2ab0f5c93b11e223fd8f4493939be2ee0de

.devcontainer/README.md

@@ -32,17 +32,17 @@ Next: **[Try it out!](#try-it)**
 
 ## Quick start - GitHub Codespaces
 
-> **IMPORTANT:** The current free user beta for GitHub Codespaces uses a "Basic" sized codespace which does not have enough RAM to run a full build of VS Code and will be considerably slower during codespace start and running VS Code. You'll soon be able to use a "Standard" sized codespace (4-core, 8GB) that will be better suited for this purpose (along with even larger sizes should you need it).
+> **IMPORTANT:** You need to use a "Standard" sized codespace or larger (4-core, 8GB) since VS Code needs 6GB of RAM to compile. This is now the default for GitHub Codespaces, but do not downgrade to "Basic" unless you do not intend to compile.
 
 1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and the **New codespace**
 
     > Note that you will not see these options if you are not in the beta yet.
 
-2. After the codespace is up and running in your browser, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **View: Show Remote Explorer**.
+2. After the codespace is up and running in your browser, press <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
 
 3. You should see port `6080` under **Forwarded Ports**. Select the line and click on the globe icon to open it in a browser tab.
 
-    > If you do not see port `6080`, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>, select **Forward a Port** and enter port `6080`.
+    > If you do not see port `6080`, press <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
 
 4. In the new tab, you should see noVNC. Click **Connect** and enter `vscode` as the password.
 
@@ -58,7 +58,7 @@ You will likely see better performance when accessing the codespace you created
 
 2. Set up [VS Code for use with GitHub Codespaces](https://docs.github.com/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code)
 
-3. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
+3. After the VS Code is up and running, press <kbd>F1</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
 
 4. After you've connected to the codespace, use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
 

.eslintrc.json

@@ -982,10 +982,12 @@
 						"allowed": [
 							"FileSystemProvider",
 							"TreeDataProvider",
+							"TestProvider",
 							"CustomEditorProvider",
 							"CustomReadonlyEditorProvider",
 							"TerminalLinkProvider",
-							"AuthenticationProvider"
+							"AuthenticationProvider",
+							"NotebookContentProvider"
 						]
 					}
 				],
@@ -1014,6 +1016,7 @@
 							"override",
 							"receive",
 							"register",
+							"remove",
 							"rename",
 							"save",
 							"send",

.github/workflows/deep-classifier-scraper.yml

@@ -1,5 +1,7 @@
 name: "Deep Classifier: Scraper"
 on:
+  schedule:
+    - cron: 0 0 15 * * # 15th of the month
   repository_dispatch:
     types: [trigger-deep-classifier-scraper]
 
@@ -23,5 +25,5 @@ jobs:
         with:
           blobContainerName: vscode-issue-classifier
           blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          token: ${{secrets.ISSUE_SCRAPER_TOKEN}}
+          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
           appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}

.github/workflows/devcontainer-cache.yml

@@ -22,7 +22,7 @@ jobs:
 
       - name: Azure CLI login
         id: az_login
-        uses: azure/login@v1
+        uses: azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
         with:
           creds: ${{ secrets.AZ_ACR_CREDS }}
 

.github/workflows/no-yarn-lock-changes.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - id: file_changes
-        uses: trilom/file-changes-action@v1.2.4
+        uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
       - name: Check for yarn.lock changes
         run: |
           cat $HOME/files.json | jq -e '.[] | test("yarn\\.lock$") | not' \

.vscode/notebooks/endgame.github-issues

@@ -3,147 +3,126 @@
     "kind": 1,
     "language": "markdown",
     "value": "#### Macros",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog 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\n\n$MILESTONE=milestone:\"February 2021\"",
-    "editable": true,
-    "outputs": []
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog 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\n\n$MILESTONE=milestone:\"March 2021\"",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "# Preparation",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "## Open Pull Requests on the Milestone",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:pr is:open",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "## Open Issues on the Milestone",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:issue is:open -label:iteration-plan -label:endgame-plan -label:testplan-item",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "## Feature Requests Missing Labels",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "# Testing",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "## Test Plan Items",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:issue is:open label:testplan-item",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "## Verification Needed",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request label:verification-needed -label:verified",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "# Verification",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "## Verifiable Fixes",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified -label:unreleased",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "## Unreleased Fixes",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified label:unreleased",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "# Candidates",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$REPOS $MILESTONE is:open label:candidate",
-    "editable": true,
-    "outputs": []
+    "editable": true
   }
 ]

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

@@ -9,7 +9,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server\n\n$MILESTONE=milestone:\"February 2021\"\n\n$MINE=assignee:@me",
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server\n\n$MILESTONE=milestone:\"March 2021\"\n\n$MINE=assignee:@me",
     "editable": true,
     "outputs": []
   },

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

@@ -3,133 +3,114 @@
     "kind": 1,
     "language": "markdown",
     "value": "##### `Config`: This should be changed every month/milestone",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "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\n\n// current milestone name\n$milestone=milestone:\"February 2021\"",
-    "editable": true,
-    "outputs": []
+    "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\n\n// current milestone name\n$milestone=milestone:\"March 2021\"",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "github-issues",
     "value": "## Milestone Work",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos $milestone assignee:@me is:open",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "github-issues",
     "value": "## Bugs, Debt, Features...",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "#### My Bugs",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open label:bug",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "#### Debt & Engineering",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open label:debt OR $repos assignee:@me is:open label:engineering",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "#### Performance 🐌 🔜 🏎",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open label:perf OR $repos assignee:@me is:open label:perf-startup OR $repos assignee:@me is:open label:perf-bloat OR $repos assignee:@me is:open label:freeze-slow-crash-leak",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "#### Feature Requests",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "### Personal Inbox\n",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "\n#### Missing Type label",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"needs more info\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "#### Not Actionable",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos assignee:@me is:open label:\"needs more info\"",
-    "editable": true,
-    "outputs": []
+    "editable": true
   }
 ]

.vscode/notebooks/verification.github-issues

@@ -3,63 +3,54 @@
     "kind": 1,
     "language": "markdown",
     "value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. ",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "#### Config: update list of `repos` and the `milestone`",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"February 2021\"",
-    "editable": true,
-    "outputs": []
+    "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"March 2021\"",
+    "editable": true
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "### Bugs You Filed",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate author:@me",
-    "editable": false,
-    "outputs": []
+    "editable": false
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "### Bugs From Outside",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand",
-    "editable": false,
-    "outputs": []
+    "value": "$repos $milestone is:closed  -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl  -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh",
+    "editable": false
   },
   {
     "kind": 1,
     "language": "markdown",
     "value": "### All",
-    "editable": true,
-    "outputs": []
+    "editable": true
   },
   {
     "kind": 2,
     "language": "github-issues",
     "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate",
-    "editable": false,
-    "outputs": []
+    "editable": false
   }
 ]

.vscode/settings.json

@@ -85,5 +85,6 @@
 		"editor.formatOnSave": true,
 	},
 	"typescript.tsc.autoDetect": "off",
-	"notebook.experimental.useMarkdownRenderer": true,
+	// "notebook.experimental.useMarkdownRenderer": true,
+  "testing.autoRun.mode": "onlyPreviouslyRun",
 }

README.md

@@ -5,7 +5,7 @@
 
 ## The Repository
 
-This repository ("`Code - OSS`") is where we (Microsoft) develop the [Visual Studio Code](https://code.visualstudio.com) product. Not only do we work on code and issues here, we also publish our [roadmap](https://github.com/microsoft/vscode/wiki/Roadmap), [monthly iteration plans](https://github.com/microsoft/vscode/wiki/Iteration-Plans), and our [endgame plans](https://github.com/microsoft/vscode/wiki/Running-the-Endgame). This source code is available to everyone under the standard [MIT license](https://github.com/microsoft/vscode/blob/main/LICENSE.txt).
+This repository ("`Code - OSS`") is where we (Microsoft) develop the [Visual Studio Code](https://code.visualstudio.com) product together with the community. Not only do we work on code and issues here, we also publish our [roadmap](https://github.com/microsoft/vscode/wiki/Roadmap), [monthly iteration plans](https://github.com/microsoft/vscode/wiki/Iteration-Plans), and our [endgame plans](https://github.com/microsoft/vscode/wiki/Running-the-Endgame). This source code is available to everyone under the standard [MIT license](https://github.com/microsoft/vscode/blob/main/LICENSE.txt).
 
 ## Visual Studio Code
 

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

ThirdPartyNotices.txt

@@ -8,42 +8,42 @@ This project incorporates components from the projects listed below. The origina
 1.	 JuliaEditorSupport/atom-language-julia version 0.21.0 (https://github.com/JuliaEditorSupport/atom-language-julia)
 2.	atom/language-clojure version 0.22.7 (https://github.com/atom/language-clojure)
 3.	atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script)
-4.	atom/language-java version 0.32.1 (https://github.com/atom/language-java)
-5.	atom/language-sass version 0.62.1 (https://github.com/atom/language-sass)
-6.	atom/language-shellscript version 0.26.0 (https://github.com/atom/language-shellscript)
-7.	atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
-8.	better-go-syntax version 1.0.0 (https://github.com/jeff-hykin/better-go-syntax/ )
-9.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
-10.	daaain/Handlebars version 1.8.0 (https://github.com/daaain/Handlebars)
-11.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
-12.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
-13.	demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
-14.	Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
-15.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-16.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-17.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
-18.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-19.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-20.	Ikuyadeu/vscode-R version 1.3.0 (https://github.com/Ikuyadeu/vscode-R)
-21.	insane version 2.6.2 (https://github.com/bevacqua/insane)
-22.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
-23.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-24.	jeff-hykin/cpp-textmate-grammar version 1.12.11 (https://github.com/jeff-hykin/cpp-textmate-grammar)
-25.	jeff-hykin/cpp-textmate-grammar version 1.15.5 (https://github.com/jeff-hykin/cpp-textmate-grammar)
-26.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-27.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-28.	language-docker (https://github.com/moby/moby)
-29.	language-less version 0.34.2 (https://github.com/atom/language-less)
-30.	language-php version 0.46.0 (https://github.com/atom/language-php)
-31.	MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
-32.	marked version 1.1.0 (https://github.com/markedjs/marked)
-33.	mdn-data version 1.1.12 (https://github.com/mdn/data)
-34.	microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/microsoft/TypeScript-TmLanguage)
-35.	microsoft/vscode-JSON.tmLanguage (https://github.com/microsoft/vscode-JSON.tmLanguage)
-36.	microsoft/vscode-markdown-tm-grammar version 1.0.0 (https://github.com/microsoft/vscode-markdown-tm-grammar)
-37.	microsoft/vscode-mssql version 1.9.0 (https://github.com/microsoft/vscode-mssql)
-38.	mmims/language-batchfile version 0.7.5 (https://github.com/mmims/language-batchfile)
-39.	octref/language-css version 0.42.11 (https://github.com/octref/language-css)
+4.	atom/language-css version 0.44.4 (https://github.com/atom/language-css)
+5.	atom/language-java version 0.32.1 (https://github.com/atom/language-java)
+6.	atom/language-sass version 0.62.1 (https://github.com/atom/language-sass)
+7.	atom/language-shellscript version 0.26.0 (https://github.com/atom/language-shellscript)
+8.	atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
+9.	better-go-syntax version 1.0.0 (https://github.com/jeff-hykin/better-go-syntax/ )
+10.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
+11.	daaain/Handlebars version 1.8.0 (https://github.com/daaain/Handlebars)
+12.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
+13.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
+14.	demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
+15.	Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
+16.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
+17.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
+18.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
+19.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
+20.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
+21.	Ikuyadeu/vscode-R version 1.3.0 (https://github.com/Ikuyadeu/vscode-R)
+22.	insane version 2.6.2 (https://github.com/bevacqua/insane)
+23.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
+24.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
+25.	jeff-hykin/cpp-textmate-grammar version 1.12.11 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+26.	jeff-hykin/cpp-textmate-grammar version 1.15.5 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+27.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
+28.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
+29.	language-docker (https://github.com/moby/moby)
+30.	language-less version 0.34.2 (https://github.com/atom/language-less)
+31.	language-php version 0.46.0 (https://github.com/atom/language-php)
+32.	MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
+33.	marked version 1.1.0 (https://github.com/markedjs/marked)
+34.	mdn-data version 1.1.12 (https://github.com/mdn/data)
+35.	microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/microsoft/TypeScript-TmLanguage)
+36.	microsoft/vscode-JSON.tmLanguage (https://github.com/microsoft/vscode-JSON.tmLanguage)
+37.	microsoft/vscode-markdown-tm-grammar version 1.0.0 (https://github.com/microsoft/vscode-markdown-tm-grammar)
+38.	microsoft/vscode-mssql version 1.9.0 (https://github.com/microsoft/vscode-mssql)
+39.	mmims/language-batchfile version 0.7.5 (https://github.com/mmims/language-batchfile)
 40.	PowerShell/EditorSyntax version 1.0.0 (https://github.com/PowerShell/EditorSyntax)
 41.	rust-syntax version 0.4.3 (https://github.com/dustypomerleau/rust-syntax)
 42.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
@@ -204,6 +204,42 @@ OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF atom/language-coffee-script NOTICES AND INFORMATION
 
+%% atom/language-css NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2014 GitHub Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------
+
+This package was derived from a TextMate bundle located at
+https://github.com/textmate/css.tmbundle and distributed under the following
+license, located in `README.mdown`:
+
+Permission to copy, use, modify, sell and distribute this
+software is granted. This software is provided "as is" without
+express or implied warranty, and with no claim as to its
+suitability for any purpose.
+=========================================
+END OF atom/language-css NOTICES AND INFORMATION
+
 %% atom/language-java NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -1704,43 +1740,6 @@ THE SOFTWARE.
 =========================================
 END OF mmims/language-batchfile NOTICES AND INFORMATION
 
-%% octref/language-css NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The MIT License (MIT)
-
-Copyright (c) 2014 GitHub Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-This package was derived from a TextMate bundle located at
-https://github.com/textmate/css.tmbundle and distributed under the following
-license, located in `README.mdown`:
-
-Permission to copy, use, modify, sell and distribute this
-software is granted. This software is provided "as is" without
-express or implied warranty, and with no claim as to its
-suitability for any purpose.
-=========================================
-END OF octref/language-css NOTICES AND INFORMATION
-
 %% PowerShell/EditorSyntax NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) Microsoft Corporation

build/.moduleignore

@@ -80,13 +80,11 @@ node-pty/scripts/**
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node
 
-vscode-nsfw/binding.gyp
-vscode-nsfw/build/**
-vscode-nsfw/src/**
-vscode-nsfw/openpa/**
-vscode-nsfw/includes/**
-!vscode-nsfw/build/Release/*.node
-!vscode-nsfw/**/*.a
+nsfw/binding.gyp
+nsfw/build/**
+nsfw/src/**
+nsfw/includes/**
+!nsfw/build/Release/*.node
 
 vsda/build/**
 vsda/ci/**

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

@@ -0,0 +1,129 @@
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "12.18.3"
+
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
+
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
+
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
+    displayName: Prepare tooling
+
+  - script: |
+      set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - script: |
+      pushd build \
+      && yarn \
+      && npm install -g typescript \
+      && tsc azure-pipelines/common/createAsset.ts \
+      && popd
+    displayName: Restore modules for just build folder and compile it
+
+  - download: current
+    artifact: vscode-darwin-$(VSCODE_ARCH)
+    displayName: Download $(VSCODE_ARCH) artifact
+
+  - script: |
+      set -e
+      unzip $(Pipeline.Workspace)/vscode-darwin-$(VSCODE_ARCH)/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      mv $(Pipeline.Workspace)/vscode-darwin-$(VSCODE_ARCH)/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Unzip & move
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    inputs:
+      ConnectedServiceName: "ESRP CodeSign"
+      FolderPath: "$(agent.builddirectory)"
+      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationSetCode": "MacAppDeveloperSign",
+            "parameters": [
+              {
+                "parameterName": "Hardening",
+                "parameterValue": "--options=runtime"
+              }
+            ],
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 60
+    displayName: Codesign
+
+  - script: |
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
+      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
+    displayName: Export bundle identifier
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    inputs:
+      ConnectedServiceName: "ESRP CodeSign"
+      FolderPath: "$(agent.builddirectory)"
+      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationSetCode": "MacAppNotarize",
+            "parameters": [
+              {
+                "parameterName": "BundleId",
+                "parameterValue": "$(BundleIdentifier)"
+              }
+            ],
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 60
+    displayName: Notarization
+
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
+    displayName: Verify start after signing (export configuration)
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - script: |
+      set -e
+
+      # For legacy purposes, arch for x64 is just 'darwin'
+      case $VSCODE_ARCH in
+        x64) ASSET_ID="darwin" ;;
+        arm64) ASSET_ID="darwin-arm64" ;;
+        universal) ASSET_ID="darwin-universal" ;;
+      esac
+
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+      node build/azure-pipelines/common/createAsset.js \
+        "$ASSET_ID" \
+        archive \
+        "VSCode-$ASSET_ID.zip" \
+        ../VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Publish Clients

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

@@ -22,6 +22,8 @@ steps:
     displayName: Extract compilation output
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
+  # Set up the credentials to retrieve distro repo and setup git persona
+  # to create a merge commit for when we merge distro into oss
   - script: |
       set -e
       cat << EOF > ~/.netrc
@@ -119,16 +121,7 @@ steps:
     displayName: Rebuild native modules for ARM64
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
-  - download: current
-    artifact: vscode-darwin-x64
-    displayName: Download x64 artifact
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
-  - download: current
-    artifact: vscode-darwin-arm64
-    displayName: Download arm64 artifact
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
+  # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
   - script: |
       set -e
       node build/azure-pipelines/mixin
@@ -138,7 +131,7 @@ steps:
       set -e
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
         yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
-    displayName: Build
+    displayName: Build client
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
   - script: |
@@ -150,14 +143,6 @@ steps:
     displayName: Build Server
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
-  - script: |
-      set -e
-      unzip $(Pipeline.Workspace)/vscode-darwin-x64/VSCode-darwin-x64.zip -d $(agent.builddirectory)/vscode-x64
-      unzip $(Pipeline.Workspace)/vscode-darwin-arm64/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/vscode-arm64
-      DEBUG=* node build/darwin/create-universal-app.js
-    displayName: Create Universal App
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
   - script: |
       set -e
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
@@ -165,6 +150,29 @@ steps:
     displayName: Download Electron and Playwright
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
+  - download: current
+    artifact: vscode-darwin-x64
+    displayName: Download x64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  - download: current
+    artifact: vscode-darwin-arm64
+    displayName: Download arm64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  - script: |
+      set -e
+      cp $(Pipeline.Workspace)/vscode-darwin-x64/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin-x64.zip
+      cp $(Pipeline.Workspace)/vscode-darwin-arm64/VSCode-darwin-arm64.zip $(agent.builddirectory)/VSCode-darwin-arm64.zip
+      unzip $(agent.builddirectory)/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
+      unzip $(agent.builddirectory)/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64
+      DEBUG=* node build/darwin/create-universal-app.js
+    displayName: Create Universal App
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  # Setting hardened entitlements is a requirement for:
+  # * Apple notarization
+  # * Running tests on Big Sur (because Big Sur has additional security precautions)
   - script: |
       set -e
       security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
@@ -173,9 +181,8 @@ steps:
       echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
       security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
       security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-      VSCODE_ARCH="$(VSCODE_ARCH)" DEBUG=electron-osx-sign* node build/darwin/sign.js
+      VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
     displayName: Set Hardened Entitlements
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
@@ -284,91 +291,19 @@ steps:
     displayName: Archive build
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppDeveloperSign",
-            "parameters": [
-              {
-                "parameterName": "Hardening",
-                "parameterValue": "--options=runtime"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Codesign
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip "*.pkg"
-    displayName: Clean
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
-      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
-    displayName: Export bundle identifier
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppNotarize",
-            "parameters": [
-              {
-                "parameterName": "BundleId",
-                "parameterValue": "$(BundleIdentifier)"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Notarization
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
-    displayName: Verify start after signing (export configuration)
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'), ne(variables['VSCODE_PUBLISH'], 'false'))
-
   - script: |
       set -e
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
       AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
       AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
       AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      VSCODE_ARCH="$(VSCODE_ARCH)" \
-      ./build/azure-pipelines/darwin/publish.sh
-    displayName: Publish
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+      VSCODE_ARCH="$(VSCODE_ARCH)" ./build/azure-pipelines/darwin/publish-server.sh
+    displayName: Publish Servers
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
     artifact: vscode-darwin-$(VSCODE_ARCH)
-    displayName: Publish archive
+    displayName: Publish client archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
@@ -386,5 +321,5 @@ steps:
       VSCODE_ARCH="$(VSCODE_ARCH)" \
       yarn gulp upload-vscode-configuration
     displayName: Upload configuration (for Bing settings search)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
     continueOnError: true

build/azure-pipelines/darwin/publish-server.sh

@@ -1,20 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-# Publish DEB
-case $VSCODE_ARCH in
-	x64) ASSET_ID="darwin" ;;
-	arm64) ASSET_ID="darwin-arm64" ;;
-	universal) ASSET_ID="darwin-universal" ;;
-esac
-
-# publish the build
-node build/azure-pipelines/common/createAsset.js \
-	"$ASSET_ID" \
-	archive \
-	"VSCode-$ASSET_ID.zip" \
-	../VSCode-darwin-$VSCODE_ARCH.zip
-
 if [ "$VSCODE_ARCH" == "x64" ]; then
 	# package Remote Extension Host
 	pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd

build/azure-pipelines/linux/product-build-linux.yml

@@ -97,10 +97,6 @@ steps:
         fi
         echo "Yarn failed $i, trying again..."
       done
-
-      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
-      cd ./node_modules/keytar
-      npx node-gyp rebuild
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

build/azure-pipelines/linux/snap-build-linux.yml

@@ -48,7 +48,7 @@ steps:
         x64) SNAPCRAFT_TARGET_ARGS="" ;;
         *) SNAPCRAFT_TARGET_ARGS="--target-arch $(VSCODE_ARCH)" ;;
       esac
-      (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft snap $SNAPCRAFT_TARGET_ARGS --output "$SNAP_PATH")
+      (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft prime $SNAPCRAFT_TARGET_ARGS && snap pack prime --compression=lzo --filename="$SNAP_PATH")
 
       # Publish snap package
       AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \

build/azure-pipelines/product-build.yml

@@ -254,6 +254,15 @@ stages:
               VSCODE_ARCH: x64
             steps:
               - template: darwin/product-build-darwin.yml
+          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
+            - job: macOSSign
+              dependsOn:
+                - macOS
+              timeoutInMinutes: 90
+              variables:
+                VSCODE_ARCH: x64
+              steps:
+                - template: darwin/product-build-darwin-sign.yml
 
         - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
           - job: macOSARM64
@@ -262,6 +271,15 @@ stages:
               VSCODE_ARCH: arm64
             steps:
               - template: darwin/product-build-darwin.yml
+        - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
+            - job: macOSARM64Sign
+              dependsOn:
+                - macOSARM64
+              timeoutInMinutes: 90
+              variables:
+                VSCODE_ARCH: arm64
+              steps:
+                - template: darwin/product-build-darwin-sign.yml
 
         - ${{ if eq(variables['VSCODE_BUILD_MACOS_UNIVERSAL'], true) }}:
           - job: macOSUniversal
@@ -273,6 +291,15 @@ stages:
               VSCODE_ARCH: universal
             steps:
               - template: darwin/product-build-darwin.yml
+          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
+            - job: macOSUniversalSign
+              dependsOn:
+                - macOSUniversal
+              timeoutInMinutes: 90
+              variables:
+                VSCODE_ARCH: universal
+              steps:
+                - template: darwin/product-build-darwin-sign.yml
 
   - ${{ if and(eq(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
     - stage: Mooncake

build/azure-pipelines/publish-types/update-types.js

@@ -60,7 +60,7 @@ function getNewFileHeader(tag) {
         `/*---------------------------------------------------------------------------------------------`,
         ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
         ` *  Licensed under the MIT License.`,
-        ` *  See https://github.com/microsoft/vscode/blob/master/LICENSE.txt for license information.`,
+        ` *  See https://github.com/microsoft/vscode/blob/main/LICENSE.txt for license information.`,
         ` *--------------------------------------------------------------------------------------------*/`,
         ``,
         `/**`,

build/darwin/create-universal-app.js

@@ -16,8 +16,8 @@ async function main() {
         throw new Error('$AGENT_BUILDDIRECTORY not set');
     }
     const appName = product.nameLong + '.app';
-    const x64AppPath = path.join(buildDir, 'vscode-x64', appName);
-    const arm64AppPath = path.join(buildDir, 'vscode-arm64', appName);
+    const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
+    const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
     const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
     const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
     const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);

build/darwin/create-universal-app.ts

@@ -20,8 +20,8 @@ async function main() {
 	}
 
 	const appName = product.nameLong + '.app';
-	const x64AppPath = path.join(buildDir, 'vscode-x64', appName);
-	const arm64AppPath = path.join(buildDir, 'vscode-arm64', appName);
+	const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
+	const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
 	const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
 	const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
 	const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);

build/filters.js

@@ -51,8 +51,10 @@ module.exports.indentationFilter = [
 	'!test/monaco/out/**',
 	'!test/smoke/out/**',
 	'!extensions/typescript-language-features/test-workspace/**',
+	'!extensions/notebook-markdown-extensions/notebook-out/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/vscode-custom-editor-tests/test-workspace/**',
 	'!build/monaco/**',
 	'!build/win32/**',
 
@@ -117,6 +119,7 @@ module.exports.copyrightFilter = [
 	'!resources/completions/**',
 	'!extensions/configuration-editing/build/inline-allOf.ts',
 	'!extensions/markdown-language-features/media/highlight.css',
+	'!extensions/notebook-markdown-extensions/notebook-out/**',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
 	'!extensions/*/server/bin/*',
 	'!src/vs/editor/test/node/classification/typescript-test.ts',

build/gulpfile.extensions.js

@@ -199,7 +199,39 @@ exports.watchExtensionsTask = watchExtensionsTask;
 const compileExtensionsBuildLegacyTask = task.define('compile-extensions-build-legacy', task.parallel(...tasks.map(t => t.compileBuildTask)));
 gulp.task(compileExtensionsBuildLegacyTask);
 
-// Azure Pipelines
+//#region Extension media
+
+// Additional projects to webpack. These typically build code for webviews
+const mediaCompilations = [
+	'markdown-language-features/webpack.config.js',
+	'markdown-language-features/webpack.notebook.js',
+	'notebook-markdown-extensions/webpack.notebook.js',
+	'simple-browser/webpack.config.js',
+];
+
+const compileExtensionMediaTask = task.define('compile-extension-media', () => buildExtensionMedia(false));
+gulp.task(compileExtensionMediaTask);
+exports.compileExtensionMediaTask = compileExtensionMediaTask;
+
+const watchExtensionMedia = task.define('watch-extension-media', () => buildExtensionMedia(true));
+gulp.task(watchExtensionMedia);
+exports.watchExtensionMedia = watchExtensionMedia;
+
+function buildExtensionMedia(isWatch, outputRoot) {
+	const webpackConfigLocations = mediaCompilations.map(p => {
+		return {
+			configPath: path.join(extensionsPath, p),
+			outputRoot: outputRoot ? path.join(root, outputRoot, path.dirname(p)) : undefined
+		};
+	});
+	return webpackExtensions('packaging extension media', isWatch, webpackConfigLocations);
+}
+const compileExtensionMediaBuildTask = task.define('compile-extension-media-build', () => buildExtensionMedia(false, '.build/extensions'));
+gulp.task(compileExtensionMediaBuildTask);
+
+//#endregion
+
+//#region Azure Pipelines
 
 const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
 const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
@@ -209,10 +241,12 @@ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.
 ));
 
 gulp.task(compileExtensionsBuildTask);
-gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask)));
+gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask)));
 
 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;
 
+//#endregion
+
 const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
 gulp.task(compileWebExtensionsTask);
 exports.compileWebExtensionsTask = compileWebExtensionsTask;
@@ -222,23 +256,39 @@ gulp.task(watchWebExtensionsTask);
 exports.watchWebExtensionsTask = watchWebExtensionsTask;
 
 async function buildWebExtensions(isWatch) {
-	const webpack = require('webpack');
-
 	const webpackConfigLocations = await nodeUtil.promisify(glob)(
 		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
 		{ ignore: ['**/node_modules'] }
 	);
+	return webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath })));
+}
+
+/**
+ * @param {string} taskName
+ * @param {boolean} isWatch
+ * @param {{ configPath: string, outputRoot?: boolean}} webpackConfigLocations
+ */
+async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
+	const webpack = require('webpack');
 
 	const webpackConfigs = [];
 
-	for (const webpackConfigPath of webpackConfigLocations) {
-		const configOrFnOrArray = require(webpackConfigPath);
+	for (const { configPath, outputRoot } of webpackConfigLocations) {
+		const configOrFnOrArray = require(configPath);
 		function addConfig(configOrFn) {
+			let config;
 			if (typeof configOrFn === 'function') {
-				webpackConfigs.push(configOrFn({}, {}));
+				config = configOrFn({}, {});
+				webpackConfigs.push(config);
 			} else {
-				webpackConfigs.push(configOrFn);
+				config = configOrFn;
 			}
+
+			if (outputRoot) {
+				config.output.path = path.join(outputRoot, path.relative(path.dirname(configPath), config.output.path));
+			}
+
+			webpackConfigs.push(configOrFn);
 		}
 		addConfig(configOrFnOrArray);
 	}
@@ -249,7 +299,7 @@ async function buildWebExtensions(isWatch) {
 				if (outputPath) {
 					const relativePath = path.relative(extensionsPath, outputPath).replace(/\\/g, '/');
 					const match = relativePath.match(/[^\/]+(\/server|\/client)?/);
-					fancyLog(`Finished ${ansiColors.green('packaging web extension')} ${ansiColors.cyan(match[0])} with ${stats.errors.length} errors.`);
+					fancyLog(`Finished ${ansiColors.green(taskName)} ${ansiColors.cyan(match[0])} with ${stats.errors.length} errors.`);
 				}
 				if (Array.isArray(stats.errors)) {
 					stats.errors.forEach(error => {

build/gulpfile.js

@@ -13,7 +13,7 @@ const util = require('./lib/util');
 const task = require('./lib/task');
 const compilation = require('./lib/compilation');
 const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./gulpfile.editor');
-const { compileExtensionsTask, watchExtensionsTask } = require('./gulpfile.extensions');
+const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask } = require('./gulpfile.extensions');
 
 // Fast compile for development time
 const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.compileTask('src', 'out', false)));
@@ -23,7 +23,7 @@ const watchClientTask = task.define('watch-client', task.series(util.rimraf('out
 gulp.task(watchClientTask);
 
 // All
-const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
+const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
 gulp.task(compileTask);
 
 gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));

build/gulpfile.vscode.js

@@ -58,9 +58,9 @@ const vscodeResources = [
 	'out-build/vs/base/common/performance.js',
 	'out-build/vs/base/node/languagePacks.js',
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
-	'out-build/vs/base/node/userDataPath.js',
 	'out-build/vs/base/browser/ui/codicons/codicon/**',
 	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
+	'out-build/vs/platform/environment/node/userDataPath.js',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',

build/lib/electron.js

@@ -28,7 +28,7 @@ exports.config = {
     version: util.getElectronVersion(),
     productAppName: product.nameLong,
     companyName: 'Microsoft Corporation',
-    copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
+    copyright: 'Copyright (C) 2021 Microsoft. All rights reserved',
     darwinIcon: 'resources/darwin/code.icns',
     darwinBundleIdentifier: product.darwinBundleIdentifier,
     darwinApplicationCategoryType: 'public.app-category.developer-tools',

build/lib/i18n.js

@@ -237,14 +237,14 @@ XLF.parse = function (xlfString) {
                         }
                         let val = unit.target[0];
                         if (typeof val !== 'string') {
-                            val = val._;
+                            // We allow empty source values so support them for translations as well.
+                            val = val._ ? val._ : '';
                         }
-                        if (key && val) {
-                            messages[key] = decodeEntities(val);
-                        }
-                        else {
-                            reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+                        if (!key) {
+                            reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+                            return;
                         }
+                        messages[key] = decodeEntities(val);
                     });
                     files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
                 }

build/lib/i18n.ts

@@ -339,13 +339,14 @@ export class XLF {
 
 							let val = unit.target[0];
 							if (typeof val !== 'string') {
-								val = val._;
+								// We allow empty source values so support them for translations as well.
+								val = val._ ? val._ : '';
 							}
-							if (key && val) {
-								messages[key] = decodeEntities(val);
-							} else {
-								reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+							if (!key) {
+								reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+								return;
 							}
+							messages[key] = decodeEntities(val);
 						});
 						files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
 					}

build/lib/layersChecker.js

@@ -56,6 +56,7 @@ const CORE_TYPES = [
 const NATIVE_TYPES = [
     'NativeParsedArgs',
     'INativeEnvironmentService',
+    'AbstractNativeEnvironmentService',
     'INativeWindowConfiguration',
     'ICommonNativeHostService'
 ];
@@ -80,19 +81,9 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
-    // Common: vs/platform/environment/common/argv.ts
+    // Common: vs/platform/environment/common/*
     {
-        target: '**/vs/platform/environment/common/argv.ts',
-        disallowedTypes: [ /* Ignore native types that are defined from here */],
-        allowedTypes: CORE_TYPES,
-        disallowedDefinitions: [
-            'lib.dom.d.ts',
-            '@types/node' // no node.js
-        ]
-    },
-    // Common: vs/platform/environment/common/environment.ts
-    {
-        target: '**/vs/platform/environment/common/environment.ts',
+        target: '**/vs/platform/environment/common/*.ts',
         disallowedTypes: [ /* Ignore native types that are defined from here */],
         allowedTypes: CORE_TYPES,
         disallowedDefinitions: [

build/lib/layersChecker.ts

@@ -58,6 +58,7 @@ const CORE_TYPES = [
 const NATIVE_TYPES = [
 	'NativeParsedArgs',
 	'INativeEnvironmentService',
+	'AbstractNativeEnvironmentService',
 	'INativeWindowConfiguration',
 	'ICommonNativeHostService'
 ];
@@ -87,20 +88,9 @@ const RULES = [
 		]
 	},
 
-	// Common: vs/platform/environment/common/argv.ts
+	// Common: vs/platform/environment/common/*
 	{
-		target: '**/vs/platform/environment/common/argv.ts',
-		disallowedTypes: [/* Ignore native types that are defined from here */],
-		allowedTypes: CORE_TYPES,
-		disallowedDefinitions: [
-			'lib.dom.d.ts', // no DOM
-			'@types/node'	// no node.js
-		]
-	},
-
-	// Common: vs/platform/environment/common/environment.ts
-	{
-		target: '**/vs/platform/environment/common/environment.ts',
+		target: '**/vs/platform/environment/common/*.ts',
 		disallowedTypes: [/* Ignore native types that are defined from here */],
 		allowedTypes: CORE_TYPES,
 		disallowedDefinitions: [

build/monaco/package.json

@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",

build/package.json

@@ -52,7 +52,7 @@
     "p-limit": "^3.1.0",
     "plist": "^3.0.1",
     "source-map": "0.6.1",
-    "typescript": "^4.3.0-dev.20210216",
+    "typescript": "^4.3.0-dev.20210305",
     "vsce": "1.48.0",
     "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58"
   },

build/yarn.lock

@@ -1884,10 +1884,10 @@ typescript@^4.1.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
   integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
-typescript@^4.3.0-dev.20210216:
-  version "4.3.0-dev.20210216"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210216.tgz#233327e6094008c02265ba140f8d9ece9133421e"
-  integrity sha512-pJLcC/kqnE+0rftTRc2/gYBkz9nl+kJfaU8sSOLYnzUvD8p+LOZMzXfaLoKPdGFJ6U9+Ox/sYV9HBTJVEjSTYg==
+typescript@^4.3.0-dev.20210305:
+  version "4.3.0-dev.20210305"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210305.tgz#5e354b303c435f84a25fa82f45e9c412bfd5bd8f"
+  integrity sha512-OTALeeen7kl6FU1tcXRk3h+WY1NnE5lwyTGAZUCt9hw6tdaifgLXqEkfw9NHJc0xKV6PnU8GgnYFFVVyHLPSHg==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.5"

extensions/configuration-editing/schemas/attachContainer.schema.json

@@ -22,9 +22,9 @@
 				"portsAttributes": {
 					"type": "object",
 					"patternProperties": {
-						"^\\d+(\\-\\d+)?$": {
+						"(^\\d+(\\-\\d+)?$)|(.+)": {
 							"type": "object",
-							"description": "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to",
+							"description": "A port, range of ports (ex. \"40000-55000\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression.",
 							"properties": {
 								"onAutoForward": {
 									"type": "string",
@@ -53,27 +53,57 @@
 								"label": {
 									"type": "string",
 									"description": "Label that will be shown in the UI for this port.",
-									"default": "Labeled Port"
+									"default": "Application"
 								}
 							},
 							"default": {
-								"label": "Labeled Port",
+								"label": "Application",
 								"onAutoForward": "notify"
 							}
 						}
 					},
-					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n}\n```",
+					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```",
 					"defaultSnippets": [
 						{
 							"body": {
 								"${1:3000}": {
-									"label": "${2:My Port}",
+									"label": "${2:Application}",
 									"onAutoForward": "notify"
 								}
 							}
 						}
 					],
-					"errorMessage": "Must be a port number or a range of port numbers",
+					"additionalProperties": false
+				},
+				"otherPortsAttributes": {
+					"type": "object",
+					"properties": {
+						"onAutoForward": {
+							"type": "string",
+							"enum": ["notify", "openBrowser", "openPreview", "silent", "ignore"],
+							"enumDescriptions": [
+								"Shows a notification when a port is automatically forwarded.",
+								"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser.",
+								"Opens a preview in the same window when the port is automatically forwarded.",
+								"Shows no notification and takes no action when this port is automatically forwarded.",
+								"This port will not be automatically forwarded."
+							],
+							"description": "Defines the action that occurs when the port is discovered for automatic forwarding",
+							"default": "notify"
+						},
+						"elevateIfNeeded": {
+							"type": "boolean",
+							"description": "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port.",
+							"default": false
+						},
+						"label": {
+							"type": "string",
+							"description": "Label that will be shown in the UI for this port.",
+							"default": "Application"
+						}
+					},
+					"defaultSnippets": [{ "body": { "onAutoForward": "ignore" } }],
+					"markdownDescription": "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
 					"additionalProperties": false
 				},
 				"settings": {

extensions/configuration-editing/schemas/devContainer.schema.generated.json

@@ -130,9 +130,9 @@
 				"portsAttributes": {
 					"type": "object",
 					"patternProperties": {
-						"^\\d+(\\-\\d+)?$": {
+						"(^\\d+(\\-\\d+)?$)|(.+)": {
 							"type": "object",
-							"description": "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to",
+							"description": "A port, range of ports (ex. \"40000-55000\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression.",
 							"properties": {
 								"onAutoForward": {
 									"type": "string",
@@ -161,28 +161,70 @@
 								"label": {
 									"type": "string",
 									"description": "Label that will be shown in the UI for this port.",
-									"default": "Labeled Port"
+									"default": "Application"
 								}
 							},
 							"default": {
-								"label": "Labeled Port",
+								"label": "Application",
 								"onAutoForward": "notify"
 							},
 							"additionalProperties": false
 						}
 					},
-					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n}\n```",
+					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```",
 					"defaultSnippets": [
 						{
 							"body": {
 								"${1:3000}": {
-									"label": "${2:My Port}",
+									"label": "${2:Application}",
 									"onAutoForward": "notify"
 								}
 							}
 						}
 					],
-					"errorMessage": "Must be a port number or a range of port numbers",
+					"additionalProperties": false
+				},
+				"otherPortsAttributes": {
+					"type": "object",
+					"properties": {
+						"onAutoForward": {
+							"type": "string",
+							"enum": [
+								"notify",
+								"openBrowser",
+								"openPreview",
+								"silent",
+								"ignore"
+							],
+							"enumDescriptions": [
+								"Shows a notification when a port is automatically forwarded.",
+								"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser.",
+								"Opens a preview in the same window when the port is automatically forwarded.",
+								"Shows no notification and takes no action when this port is automatically forwarded.",
+								"This port will not be automatically forwarded."
+							],
+							"description": "Defines the action that occurs when the port is discovered for automatic forwarding",
+							"default": "notify"
+						},
+						"elevateIfNeeded": {
+							"type": "boolean",
+							"description": "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port.",
+							"default": false
+						},
+						"label": {
+							"type": "string",
+							"description": "Label that will be shown in the UI for this port.",
+							"default": "Application"
+						}
+					},
+					"defaultSnippets": [
+						{
+							"body": {
+								"onAutoForward": "ignore"
+							}
+						}
+					],
+					"markdownDescription": "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
 					"additionalProperties": false
 				},
 				"remoteEnv": {
@@ -387,9 +429,9 @@
 				"portsAttributes": {
 					"type": "object",
 					"patternProperties": {
-						"^\\d+(\\-\\d+)?$": {
+						"(^\\d+(\\-\\d+)?$)|(.+)": {
 							"type": "object",
-							"description": "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to",
+							"description": "A port, range of ports (ex. \"40000-55000\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression.",
 							"properties": {
 								"onAutoForward": {
 									"type": "string",
@@ -418,28 +460,70 @@
 								"label": {
 									"type": "string",
 									"description": "Label that will be shown in the UI for this port.",
-									"default": "Labeled Port"
+									"default": "Application"
 								}
 							},
 							"default": {
-								"label": "Labeled Port",
+								"label": "Application",
 								"onAutoForward": "notify"
 							},
 							"additionalProperties": false
 						}
 					},
-					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n}\n```",
+					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```",
 					"defaultSnippets": [
 						{
 							"body": {
 								"${1:3000}": {
-									"label": "${2:My Port}",
+									"label": "${2:Application}",
 									"onAutoForward": "notify"
 								}
 							}
 						}
 					],
-					"errorMessage": "Must be a port number or a range of port numbers",
+					"additionalProperties": false
+				},
+				"otherPortsAttributes": {
+					"type": "object",
+					"properties": {
+						"onAutoForward": {
+							"type": "string",
+							"enum": [
+								"notify",
+								"openBrowser",
+								"openPreview",
+								"silent",
+								"ignore"
+							],
+							"enumDescriptions": [
+								"Shows a notification when a port is automatically forwarded.",
+								"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser.",
+								"Opens a preview in the same window when the port is automatically forwarded.",
+								"Shows no notification and takes no action when this port is automatically forwarded.",
+								"This port will not be automatically forwarded."
+							],
+							"description": "Defines the action that occurs when the port is discovered for automatic forwarding",
+							"default": "notify"
+						},
+						"elevateIfNeeded": {
+							"type": "boolean",
+							"description": "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port.",
+							"default": false
+						},
+						"label": {
+							"type": "string",
+							"description": "Label that will be shown in the UI for this port.",
+							"default": "Application"
+						}
+					},
+					"defaultSnippets": [
+						{
+							"body": {
+								"onAutoForward": "ignore"
+							}
+						}
+					],
+					"markdownDescription": "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
 					"additionalProperties": false
 				},
 				"remoteEnv": {
@@ -620,9 +704,9 @@
 				"portsAttributes": {
 					"type": "object",
 					"patternProperties": {
-						"^\\d+(\\-\\d+)?$": {
+						"(^\\d+(\\-\\d+)?$)|(.+)": {
 							"type": "object",
-							"description": "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to",
+							"description": "A port, range of ports (ex. \"40000-55000\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression.",
 							"properties": {
 								"onAutoForward": {
 									"type": "string",
@@ -651,28 +735,70 @@
 								"label": {
 									"type": "string",
 									"description": "Label that will be shown in the UI for this port.",
-									"default": "Labeled Port"
+									"default": "Application"
 								}
 							},
 							"default": {
-								"label": "Labeled Port",
+								"label": "Application",
 								"onAutoForward": "notify"
 							},
 							"additionalProperties": false
 						}
 					},
-					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n}\n```",
+					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```",
 					"defaultSnippets": [
 						{
 							"body": {
 								"${1:3000}": {
-									"label": "${2:My Port}",
+									"label": "${2:Application}",
 									"onAutoForward": "notify"
 								}
 							}
 						}
 					],
-					"errorMessage": "Must be a port number or a range of port numbers",
+					"additionalProperties": false
+				},
+				"otherPortsAttributes": {
+					"type": "object",
+					"properties": {
+						"onAutoForward": {
+							"type": "string",
+							"enum": [
+								"notify",
+								"openBrowser",
+								"openPreview",
+								"silent",
+								"ignore"
+							],
+							"enumDescriptions": [
+								"Shows a notification when a port is automatically forwarded.",
+								"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser.",
+								"Opens a preview in the same window when the port is automatically forwarded.",
+								"Shows no notification and takes no action when this port is automatically forwarded.",
+								"This port will not be automatically forwarded."
+							],
+							"description": "Defines the action that occurs when the port is discovered for automatic forwarding",
+							"default": "notify"
+						},
+						"elevateIfNeeded": {
+							"type": "boolean",
+							"description": "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port.",
+							"default": false
+						},
+						"label": {
+							"type": "string",
+							"description": "Label that will be shown in the UI for this port.",
+							"default": "Application"
+						}
+					},
+					"defaultSnippets": [
+						{
+							"body": {
+								"onAutoForward": "ignore"
+							}
+						}
+					],
+					"markdownDescription": "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
 					"additionalProperties": false
 				},
 				"remoteEnv": {
@@ -819,9 +945,9 @@
 				"portsAttributes": {
 					"type": "object",
 					"patternProperties": {
-						"^\\d+(\\-\\d+)?$": {
+						"(^\\d+(\\-\\d+)?$)|(.+)": {
 							"type": "object",
-							"description": "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to",
+							"description": "A port, range of ports (ex. \"40000-55000\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression.",
 							"properties": {
 								"onAutoForward": {
 									"type": "string",
@@ -850,28 +976,70 @@
 								"label": {
 									"type": "string",
 									"description": "Label that will be shown in the UI for this port.",
-									"default": "Labeled Port"
+									"default": "Application"
 								}
 							},
 							"default": {
-								"label": "Labeled Port",
+								"label": "Application",
 								"onAutoForward": "notify"
 							},
 							"additionalProperties": false
 						}
 					},
-					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n}\n```",
+					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```",
 					"defaultSnippets": [
 						{
 							"body": {
 								"${1:3000}": {
-									"label": "${2:My Port}",
+									"label": "${2:Application}",
 									"onAutoForward": "notify"
 								}
 							}
 						}
 					],
-					"errorMessage": "Must be a port number or a range of port numbers",
+					"additionalProperties": false
+				},
+				"otherPortsAttributes": {
+					"type": "object",
+					"properties": {
+						"onAutoForward": {
+							"type": "string",
+							"enum": [
+								"notify",
+								"openBrowser",
+								"openPreview",
+								"silent",
+								"ignore"
+							],
+							"enumDescriptions": [
+								"Shows a notification when a port is automatically forwarded.",
+								"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser.",
+								"Opens a preview in the same window when the port is automatically forwarded.",
+								"Shows no notification and takes no action when this port is automatically forwarded.",
+								"This port will not be automatically forwarded."
+							],
+							"description": "Defines the action that occurs when the port is discovered for automatic forwarding",
+							"default": "notify"
+						},
+						"elevateIfNeeded": {
+							"type": "boolean",
+							"description": "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port.",
+							"default": false
+						},
+						"label": {
+							"type": "string",
+							"description": "Label that will be shown in the UI for this port.",
+							"default": "Application"
+						}
+					},
+					"defaultSnippets": [
+						{
+							"body": {
+								"onAutoForward": "ignore"
+							}
+						}
+					],
+					"markdownDescription": "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
 					"additionalProperties": false
 				},
 				"remoteEnv": {
@@ -987,9 +1155,9 @@
 				"portsAttributes": {
 					"type": "object",
 					"patternProperties": {
-						"^\\d+(\\-\\d+)?$": {
+						"(^\\d+(\\-\\d+)?$)|(.+)": {
 							"type": "object",
-							"description": "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to",
+							"description": "A port, range of ports (ex. \"40000-55000\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression.",
 							"properties": {
 								"onAutoForward": {
 									"type": "string",
@@ -1018,28 +1186,70 @@
 								"label": {
 									"type": "string",
 									"description": "Label that will be shown in the UI for this port.",
-									"default": "Labeled Port"
+									"default": "Application"
 								}
 							},
 							"default": {
-								"label": "Labeled Port",
+								"label": "Application",
 								"onAutoForward": "notify"
 							},
 							"additionalProperties": false
 						}
 					},
-					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n}\n```",
+					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```",
 					"defaultSnippets": [
 						{
 							"body": {
 								"${1:3000}": {
-									"label": "${2:My Port}",
+									"label": "${2:Application}",
 									"onAutoForward": "notify"
 								}
 							}
 						}
 					],
-					"errorMessage": "Must be a port number or a range of port numbers",
+					"additionalProperties": false
+				},
+				"otherPortsAttributes": {
+					"type": "object",
+					"properties": {
+						"onAutoForward": {
+							"type": "string",
+							"enum": [
+								"notify",
+								"openBrowser",
+								"openPreview",
+								"silent",
+								"ignore"
+							],
+							"enumDescriptions": [
+								"Shows a notification when a port is automatically forwarded.",
+								"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser.",
+								"Opens a preview in the same window when the port is automatically forwarded.",
+								"Shows no notification and takes no action when this port is automatically forwarded.",
+								"This port will not be automatically forwarded."
+							],
+							"description": "Defines the action that occurs when the port is discovered for automatic forwarding",
+							"default": "notify"
+						},
+						"elevateIfNeeded": {
+							"type": "boolean",
+							"description": "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port.",
+							"default": false
+						},
+						"label": {
+							"type": "string",
+							"description": "Label that will be shown in the UI for this port.",
+							"default": "Application"
+						}
+					},
+					"defaultSnippets": [
+						{
+							"body": {
+								"onAutoForward": "ignore"
+							}
+						}
+					],
+					"markdownDescription": "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
 					"additionalProperties": false
 				},
 				"remoteEnv": {

extensions/configuration-editing/schemas/devContainer.schema.src.json

@@ -36,9 +36,9 @@
 				"portsAttributes": {
 					"type": "object",
 					"patternProperties": {
-						"^\\d+(\\-\\d+)?$": {
+						"(^\\d+(\\-\\d+)?$)|(.+)": {
 							"type": "object",
-							"description": "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to",
+							"description": "A port, range of ports (ex. \"40000-55000\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression.",
 							"properties": {
 								"onAutoForward": {
 									"type": "string",
@@ -67,27 +67,69 @@
 								"label": {
 									"type": "string",
 									"description": "Label that will be shown in the UI for this port.",
-									"default": "Labeled Port"
+									"default": "Application"
 								}
 							},
 							"default": {
-								"label": "Labeled Port",
+								"label": "Application",
 								"onAutoForward": "notify"
 							}
 						}
 					},
-					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Labeled Port\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n}\n```",
+					"markdownDescription": "Set default properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```",
 					"defaultSnippets": [
 						{
 							"body": {
 								"${1:3000}": {
-									"label": "${2:My Port}",
+									"label": "${2:Application}",
 									"onAutoForward": "notify"
 								}
 							}
 						}
 					],
-					"errorMessage": "Must be a port number or a range of port numbers",
+					"additionalProperties": false
+				},
+				"otherPortsAttributes": {
+					"type": "object",
+					"properties": {
+						"onAutoForward": {
+							"type": "string",
+							"enum": [
+								"notify",
+								"openBrowser",
+								"openPreview",
+								"silent",
+								"ignore"
+							],
+							"enumDescriptions": [
+								"Shows a notification when a port is automatically forwarded.",
+								"Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser.",
+								"Opens a preview in the same window when the port is automatically forwarded.",
+								"Shows no notification and takes no action when this port is automatically forwarded.",
+								"This port will not be automatically forwarded."
+							],
+							"description": "Defines the action that occurs when the port is discovered for automatic forwarding",
+							"default": "notify"
+						},
+						"elevateIfNeeded": {
+							"type": "boolean",
+							"description": "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port.",
+							"default": false
+						},
+						"label": {
+							"type": "string",
+							"description": "Label that will be shown in the UI for this port.",
+							"default": "Application"
+						}
+					},
+					"defaultSnippets": [
+						{
+							"body": {
+								"onAutoForward": "ignore"
+							}
+						}
+					],
+					"markdownDescription": "Set default properties that are applied to all ports that don't get properties from the setting `remote.portsAttributes`. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
 					"additionalProperties": false
 				},
 				"remoteEnv": {

extensions/css-language-features/package.nls.json

@@ -4,7 +4,7 @@
 	"css.title": "CSS",
 	"css.customData.desc": "A list of relative file paths pointing to JSON files following the [custom data format](https://github.com/microsoft/vscode-css-languageservice/blob/master/docs/customData.md).\n\nVS Code loads custom data on startup to enhance its CSS support for the custom CSS properties, at directives, pseudo classes and pseudo elements you specify in the JSON files.\n\nThe file paths are relative to workspace and only workspace folder settings are considered.",
 	"css.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
-	"css.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties",
+	"css.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
 	"css.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
 	"css.lint.boxModel.desc": "Do not use `width` or `height` when using `padding` or `border`.",
 	"css.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties.",
@@ -32,7 +32,7 @@
 	"css.hover.references": "Show references to MDN in CSS hovers.",
 	"less.title": "LESS",
 	"less.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
-	"less.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties",
+	"less.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
 	"less.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
 	"less.lint.boxModel.desc": "Do not use `width` or `height` when using `padding` or `border`.",
 	"less.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties.",
@@ -59,7 +59,7 @@
 	"less.hover.references": "Show references to MDN in LESS hovers.",
 	"scss.title": "SCSS (Sass)",
 	"scss.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
-	"scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties",
+	"scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
 	"scss.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
 	"scss.lint.boxModel.desc": "Do not use `width` or `height` when using `padding` or `border`.",
 	"scss.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties.",

extensions/css/cgmanifest.json

@@ -4,14 +4,47 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "octref/language-css",
-					"repositoryUrl": "https://github.com/octref/language-css",
-					"commitHash": "dcdc1cb4403266f4ebdb1a4f526f8b6d09fd39d6"
+					"name": "atom/language-css",
+					"repositoryUrl": "https://github.com/atom/language-css",
+					"commitHash": "339e9600ce4e024fa97a711d6330e3b5344fcbdc"
 				}
 			},
-			"license": "MIT",
-			"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/octref/language-css which was derived from the Atom package https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
-			"version": "0.42.11"
+			"licenseDetail": [
+				"Copyright (c) 2014 GitHub Inc.",
+				"",
+				"Permission is hereby granted, free of charge, to any person obtaining",
+				"a copy of this software and associated documentation files (the",
+				"\"Software\"), to deal in the Software without restriction, including",
+				"without limitation the rights to use, copy, modify, merge, publish,",
+				"distribute, sublicense, and/or sell copies of the Software, and to",
+				"permit persons to whom the Software is furnished to do so, subject to",
+				"the following conditions:",
+				"",
+				"The above copyright notice and this permission notice shall be",
+				"included in all copies or substantial portions of the Software.",
+				"",
+				"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
+				"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
+				"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
+				"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
+				"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+				"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
+				"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
+				"",
+				"--------------------------------------------------------------------",
+				"",
+				"This package was derived from a TextMate bundle located at",
+				"https://github.com/textmate/css.tmbundle and distributed under the following",
+				"license, located in `README.mdown`:",
+				"",
+				"Permission to copy, use, modify, sell and distribute this",
+				"software is granted. This software is provided \"as is\" without",
+				"express or implied warranty, and with no claim as to its",
+				"suitability for any purpose."
+			],
+			"license": "GitHub License",
+			"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
+			"version": "0.44.4"
 		}
 	],
 	"version": 1

extensions/css/package.json

@@ -9,7 +9,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin octref/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
   },
   "contributes": {
     "languages": [

extensions/emmet/package.json

@@ -84,12 +84,11 @@
           "description": "%emmetExclude%"
         },
         "emmet.extensionsPath": {
-          "type": [
-            "string",
-            "array",
-            "null"
-          ],
-          "default": null,
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [],
           "description": "%emmetExtensionsPath%"
         },
         "emmet.triggerExpansionOnTab": {

extensions/emmet/package.nls.json

@@ -28,7 +28,7 @@
 	"emmetExtensionsPath": "Path to a folder containing Emmet profiles and snippets.",
 	"emmetShowExpandedAbbreviation": "Shows expanded Emmet abbreviations as suggestions.\nThe option `\"inMarkupAndStylesheetFilesOnly\"` applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option `\"always\"` applies to all parts of the file regardless of markup/css.",
 	"emmetShowAbbreviationSuggestions": "Shows possible Emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to `\"never\"`.",
-	"emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n E.g.: `{\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}`",
+	"emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and Emmet supported language.\n For example: `{\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}`",
 	"emmetVariables": "Variables to be used in Emmet snippets",
 	"emmetTriggerExpansionOnTab": "When enabled, Emmet abbreviations are expanded when pressing TAB.",
 	"emmetPreferences": "Preferences used to modify behavior of some actions and resolvers of Emmet.",
@@ -54,7 +54,7 @@
 	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the 'o' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'o' prefix.",
 	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the 'ms' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'ms' prefix.",
 	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
-	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in css/scss/less files is parsed.",
+	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in CSS/SCSS/Less files is parsed.",
 	"emmetPreferencesOutputReverseAttributes": "If `true`, reverses attribute merging directions when resolving snippets.",
 	"emmetPreferencesCssColorShort": "If `true`, color values like #f will be expanded to #fff instead of #ffffff."
 }

extensions/emmet/src/abbreviationActions.ts

@@ -377,6 +377,11 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 		if (!helper.isAbbreviationValid(syntax, abbreviation)) {
 			return;
 		}
+		if (isStyleSheet(syntax) && abbreviation.endsWith(':')) {
+			// Fix for https://github.com/Microsoft/vscode/issues/1623
+			return;
+		}
+
 		const offset = editor.document.offsetAt(position);
 		let currentNode = getFlatNode(getRootNode(), offset, true);
 		let validateLocation = true;
@@ -440,10 +445,18 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			return true;
 		}
 
+		// Get the abbreviation right now
+		// Fixes https://github.com/microsoft/vscode/issues/74505
+		// Stylesheet abbreviations starting with @ should bring up suggestions
+		// even at outer-most level
+		const abbreviation = document.getText(new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character));
+		if (abbreviation.startsWith('@')) {
+			return true;
+		}
+
 		// Fix for https://github.com/microsoft/vscode/issues/34162
 		// Other than sass, stylus, we can make use of the terminator tokens to validate position
 		if (syntax !== 'sass' && syntax !== 'stylus' && currentNode.type === 'property') {
-
 			// Fix for upstream issue https://github.com/emmetio/css-parser/issues/3
 			if (currentNode.parent
 				&& currentNode.parent.type !== 'rule'
@@ -451,7 +464,6 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 				return false;
 			}
 
-			const abbreviation = document.getText(new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character));
 			const propertyNode = <Property>currentNode;
 			if (propertyNode.terminatorToken
 				&& propertyNode.separator

extensions/emmet/src/defaultCompletionProvider.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { Node, Stylesheet } from 'EmmetFlatNode';
 import { isValidLocationForEmmetAbbreviation, getSyntaxFromArgs } from './abbreviationActions';
-import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, getFlatNode, allowedMimeTypesInScriptTag, toLSTextDocument, getHtmlFlatNode } from './util';
+import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, getFlatNode, allowedMimeTypesInScriptTag, toLSTextDocument, getHtmlFlatNode, getEmbeddedCssNodeIfAny } from './util';
 import { Range as LSRange } from 'vscode-languageserver-textdocument';
 import { getRootNode } from './parseDocument';
 
@@ -67,7 +67,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 		const lsDoc = toLSTextDocument(document);
 		position = document.validatePosition(position);
 
-		if (document.languageId === 'html') {
+		if (syntax === 'html') {
 			if (context.triggerKind === vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) {
 				switch (this.lastCompletionType) {
 					case 'html':
@@ -137,6 +137,20 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			currentNode = getFlatNode(rootNode, offset, true);
 		}
 
+		// Fix for https://github.com/microsoft/vscode/issues/107578
+		// Validate location if syntax is of styleSheet type to ensure that location is valid for emmet abbreviation.
+		// For an html document containing a <style> node, compute the embeddedCssNode and fetch the flattened node as currentNode.
+		if (!isStyleSheet(document.languageId) && isStyleSheet(syntax) && context.triggerKind !== vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) {
+			validateLocation = true;
+			rootNode = getRootNode(document, true);
+			if (!rootNode) {
+				return;
+			}
+			let flatNode = getFlatNode(rootNode, offset, true);
+			let embeddedCssNode = getEmbeddedCssNodeIfAny(document, flatNode, position);
+			currentNode = getFlatNode(embeddedCssNode, offset, true);
+		}
+
 		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, rootNode, currentNode, syntax, offset, toRange(extractAbbreviationResults.abbreviationRange))) {
 			return;
 		}

extensions/emmet/src/emmetCommon.ts

@@ -17,11 +17,12 @@ import { fetchEditPoint } from './editPoint';
 import { fetchSelectItem } from './selectItem';
 import { evaluateMathExpression } from './evaluateMathExpression';
 import { incrementDecrement } from './incrementDecrement';
-import { LANGUAGE_MODES, getMappingForIncludedLanguages, updateEmmetExtensionsPath, getPathBaseName, getSyntaxes, getEmmetMode } from './util';
+import { LANGUAGE_MODES, getMappingForIncludedLanguages, updateEmmetExtensionsPath, migrateEmmetExtensionsPath, getPathBaseName, getSyntaxes, getEmmetMode } from './util';
 import { reflectCssValue } from './reflectCssValue';
 import { addFileToParseCache, removeFileFromParseCache } from './parseDocument';
 
 export function activateEmmetExtension(context: vscode.ExtensionContext) {
+	migrateEmmetExtensionsPath();
 	registerCompletionProviders(context);
 	updateEmmetExtensionsPath();
 

extensions/emmet/src/test/index.ts

@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 
@@ -38,34 +38,3 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 testRunner.configure(options);
 
 export = testRunner;
-
-// import * as path from 'path';
-// import * as Mocha from 'mocha';
-// import * as glob from 'glob';
-
-// export function run(testsRoot: string, cb: (error: any, failures?: number) => void): void {
-// 	// Create the mocha test
-// 	const mocha = new Mocha({
-// 		ui: 'tdd'
-// 	});
-// 	mocha.useColors(true);
-
-// 	glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
-// 		if (err) {
-// 			return cb(err);
-// 		}
-
-// 		// Add files to the test suite
-// 		files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
-
-// 		try {
-// 			// Run the mocha test
-// 			mocha.run(failures => {
-// 				cb(null, failures);
-// 			});
-// 		} catch (err) {
-// 			console.error(err);
-// 			cb(err);
-// 		}
-// 	});
-// }

extensions/emmet/src/test/partialParsingStylesheet.test.ts

@@ -60,7 +60,7 @@ p {
 /* .foo { op.3
 dn	{
 */
-	@
+	bgc
 } bg
 `;
 		return withRandomFileEditor(sassContents, '.scss', (_, doc) => {
@@ -69,7 +69,7 @@ dn	{
 				new vscode.Range(2, 3, 2, 7),		// Line commented selector
 				new vscode.Range(3, 3, 3, 7),		// Block commented selector
 				new vscode.Range(4, 0, 4, 2),		// dn inside block comment
-				new vscode.Range(6, 1, 6, 2),		// @ inside a rule whose opening brace is commented
+				new vscode.Range(6, 1, 6, 2),		// bgc inside a rule whose opening brace is commented
 				new vscode.Range(7, 2, 7, 4)		// bg after ending of badly constructed block
 			];
 			rangesNotEmmet.forEach(range => {

extensions/emmet/src/util.ts

@@ -13,7 +13,7 @@ import { TextDocument as LSTextDocument } from 'vscode-languageserver-textdocume
 import { getRootNode } from './parseDocument';
 
 let _emmetHelper: typeof EmmetHelper;
-let _currentExtensionsPath: string | undefined = undefined;
+let _currentExtensionsPath: string[] | undefined;
 
 let _homeDir: vscode.Uri | undefined;
 
@@ -36,7 +36,10 @@ export function getEmmetHelper() {
  */
 export function updateEmmetExtensionsPath(forceRefresh: boolean = false) {
 	const helper = getEmmetHelper();
-	let extensionsPath = vscode.workspace.getConfiguration('emmet')['extensionsPath'];
+	let extensionsPath = vscode.workspace.getConfiguration('emmet').get<string[]>('extensionsPath');
+	if (!extensionsPath) {
+		extensionsPath = [];
+	}
 	if (forceRefresh || _currentExtensionsPath !== extensionsPath) {
 		_currentExtensionsPath = extensionsPath;
 		if (!vscode.workspace.workspaceFolders || vscode.workspace.workspaceFolders.length === 0) {
@@ -44,11 +47,43 @@ export function updateEmmetExtensionsPath(forceRefresh: boolean = false) {
 		} else {
 			const rootPath = vscode.workspace.workspaceFolders[0].uri;
 			const fileSystem = vscode.workspace.fs;
-			helper.updateExtensionsPath(extensionsPath, fileSystem, rootPath, _homeDir).catch(err => vscode.window.showErrorMessage(err.message));
+			helper.updateExtensionsPath(extensionsPath, fileSystem, rootPath, _homeDir).catch(err => {
+				if (Array.isArray(extensionsPath) && extensionsPath.length) {
+					vscode.window.showErrorMessage(err.message);
+				}
+			});
 		}
 	}
 }
 
+/**
+ * Migrate old configuration(string) for extensionsPath to new type(string[])
+ * https://github.com/microsoft/vscode/issues/117517
+ */
+export function migrateEmmetExtensionsPath() {
+	// Get the detail info of emmet.extensionsPath setting
+	let config = vscode.workspace.getConfiguration().inspect('emmet.extensionsPath');
+
+	// Update Global setting if the value type is string or the value is null
+	if (typeof config?.globalValue === 'string') {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [config.globalValue], true);
+	} else if (config?.globalValue === null) {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [], true);
+	}
+	// Update Workspace setting if the value type is string or the value is null
+	if (typeof config?.workspaceValue === 'string') {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [config.workspaceValue], false);
+	} else if (config?.workspaceValue === null) {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [], false);
+	}
+	// Update WorkspaceFolder setting if the value type is string or the value is null
+	if (typeof config?.workspaceFolderValue === 'string') {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', [config.workspaceFolderValue]);
+	} else if (config?.workspaceFolderValue === null) {
+		vscode.workspace.getConfiguration().update('emmet.extensionsPath', []);
+	}
+}
+
 /**
  * Mapping between languages that support Emmet and completion trigger characters
  */

extensions/emmet/yarn.lock

@@ -2,17 +2,17 @@
 # yarn lockfile v1
 
 
-"@emmetio/abbreviation@^2.2.0", "@emmetio/abbreviation@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.2.1.tgz#d9458fe1f09fe042f019c48aa681165ba613a48d"
-  integrity sha512-uUNwNgbH0JPlrdXhy8VQbNPLLG7abMvOaLVMblx22i68Rl9r+2N235ALgIYFUty1yXC9DkVw6xMbz/D4QVARcQ==
+"@emmetio/abbreviation@^2.2.0", "@emmetio/abbreviation@^2.2.2":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz#746762fd9e7a8c2ea604f580c62e3cfe250e6989"
+  integrity sha512-TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw==
   dependencies:
     "@emmetio/scanner" "^1.0.0"
 
-"@emmetio/css-abbreviation@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz#4a5d96f2576dd827a2c1a060374ffa8a5408cc1c"
-  integrity sha512-CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ==
+"@emmetio/css-abbreviation@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz#90362e8a1122ce3b76f6c3157907d30182f53f54"
+  integrity sha512-qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==
   dependencies:
     "@emmetio/scanner" "^1.0.0"
 
@@ -54,17 +54,17 @@
   integrity sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI=
 
 "@types/node@^12.19.9":
-  version "12.20.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472"
-  integrity sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g==
+  version "12.20.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.6.tgz#7b73cce37352936e628c5ba40326193443cfba25"
+  integrity sha512-sRVq8d+ApGslmkE9e3i+D3gFGk7aZHAT+G4cIpIEdLJYPsWiSPwcAnJEjddLQQDqV3Ra2jOclX/Sv6YrvGYiWA==
 
 emmet@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.3.1.tgz#77614d949d1d01e5c248d08043a13a7f4d539e47"
-  integrity sha512-u8h++9u3y9QWhn0imUXfQO+s80To5MGD97zd/00wGC39CfNGBPe//ZKepJz9I1LQ2FDRXHrn+e3JaN/53Y5z6A==
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.3.4.tgz#5ba0d7a5569a68c7697dfa890c772e4f3179d123"
+  integrity sha512-3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A==
   dependencies:
-    "@emmetio/abbreviation" "^2.2.1"
-    "@emmetio/css-abbreviation" "^2.1.2"
+    "@emmetio/abbreviation" "^2.2.2"
+    "@emmetio/css-abbreviation" "^2.1.4"
 
 image-size@^0.5.2:
   version "0.5.5"
@@ -77,9 +77,9 @@ jsonc-parser@^2.3.0:
   integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
 
 vscode-emmet-helper@^2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.3.2.tgz#7f73cd579eef187a4456dc71768fb2237f47fbd4"
-  integrity sha512-uulOziI/5Ml+AyfHwgkZDXlGZsu9yNcfwZgOfRSPokc6lqYEoGK+/u902LH8Xaf68dhPLctJlhhGYwDJuqoGxg==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.4.2.tgz#98dc3275a22668f0e0ef9f2ee1fa76653d71e78f"
+  integrity sha512-j6N6xBn0NOigk2RYWESFlsnMQNJm5B10UUgOeHxRpm66Kck9Bq1nxwy6qT9eqKvzxz4hpC29Xv4aPGlOzsKw3w==
   dependencies:
     emmet "^2.3.0"
     jsonc-parser "^2.3.0"

extensions/git/package.json

@@ -1547,13 +1547,17 @@
           "command": "git.branchFrom",
           "group": "branch@4"
         },
+				{
+					"command": "git.renameBranch",
+					"group": "branch@5"
+				},
         {
-          "command": "git.renameBranch",
-          "group": "branch@5"
+          "command": "git.deleteBranch",
+          "group": "branch@6"
         },
         {
           "command": "git.publish",
-          "group": "branch@6"
+          "group": "branch@7"
         }
       ],
       "git.remotes": [
@@ -2360,6 +2364,13 @@
         "when": "config.git.enabled",
         "enablement": "git.state == initialized",
         "group": "5_scm@1"
+      },
+      {
+        "view": "explorer",
+        "contents": "%view.workbench.learnMore%",
+        "when": "config.git.enabled",
+        "enablement": "git.state == initialized",
+        "group": "5_scm@10"
       }
     ]
   },
@@ -2368,7 +2379,7 @@
     "file-type": "^7.2.0",
     "iconv-lite-umd": "0.6.8",
     "jschardet": "2.2.1",
-    "vscode-extension-telemetry": "0.1.1",
+    "vscode-extension-telemetry": "0.1.7",
     "vscode-nls": "^4.0.0",
     "vscode-uri": "^2.0.0",
     "which": "^1.3.0"

extensions/git/package.nls.json

@@ -100,7 +100,7 @@
 	"config.autoRepositoryDetection.subFolders": "Scan for subfolders of the currently opened folder.",
 	"config.autoRepositoryDetection.openEditors": "Scan for parent folders of open files.",
 	"config.autorefresh": "Whether auto refreshing is enabled.",
-	"config.autofetch": "When set to true, commits will automatically be fetched from the default remote of the current Git repository. Setting to `all` will fetch from all remotes",
+	"config.autofetch": "When set to true, commits will automatically be fetched from the default remote of the current Git repository. Setting to `all` will fetch from all remotes.",
 	"config.autofetchPeriod": "Duration in seconds between each automatic git fetch, when `git.autofetch` is enabled.",
 	"config.confirmSync": "Confirm before synchronizing git repositories.",
 	"config.countBadge": "Controls the Git count badge.",
@@ -126,7 +126,7 @@
 	"config.suggestSmartCommit": "Suggests to enable smart commit (commit all changes when there are no staged changes).",
 	"config.enableCommitSigning": "Enables commit signing with GPG or X.509.",
 	"config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.",
-	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the explorer and the open editors view.",
+	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the Explorer and the Open Editors view.",
 	"config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.",
 	"config.followTagsWhenSync": "Follow push all tags when running the sync command.",
 	"config.promptToSaveFilesBeforeStash": "Controls whether Git should check for unsaved files before stashing changes.",
@@ -177,11 +177,11 @@
 	"config.untrackedChanges.mixed": "All changes, tracked and untracked, appear together and behave equally.",
 	"config.untrackedChanges.separate": "Untracked changes appear separately in the Source Control view. They are also excluded from several actions.",
 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
-	"config.requireGitUserConfig": "Controls whether to require explicit Git user configuration or allow Git to guess if missing",
+	"config.requireGitUserConfig": "Controls whether to require explicit Git user configuration or allow Git to guess if missing.",
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for git processes spawned in the integrated terminal. Note: terminals need to be restarted to pick up a change in this setting.",
-	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view",
-	"config.timeline.date": "Controls which date to use for items in the Timeline view",
+	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.",
+	"config.timeline.date": "Controls which date to use for items in the Timeline view.",
 	"config.timeline.date.committed": "Use the committed date",
 	"config.timeline.date.authored": "Use the authored date",
 	"config.useCommitInputAsStashMessage": "Controls whether to use the message from the commit input box as the default stash message.",
@@ -211,5 +211,6 @@
 	"view.workbench.scm.folder": "The folder currently open doesn't have a git repository. You can initialize a repository which will enable source control features powered by git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 	"view.workbench.scm.workspace": "The workspace currently open doesn't have any folders containing git repositories. You can initialize a repository on a folder which will enable source control features powered by git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 	"view.workbench.scm.emptyWorkspace": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
-	"view.workbench.cloneRepository": "You can also clone a repository from a URL. To learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).\n[Clone Repository](command:git.clone 'Clone a repository once the git extension has activated')"
+	"view.workbench.cloneRepository": "You can clone a repository locally.\n[Clone Repository](command:git.clone 'Clone a repository once the git extension has activated')",
+	"view.workbench.learnMore": "To learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
 }

extensions/git/src/api/api1.ts

@@ -5,7 +5,7 @@
 
 import { Model } from '../model';
 import { Repository as BaseRepository, Resource } from '../repository';
-import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent } from './git';
+import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions } from './git';
 import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands } from 'vscode';
 import { mapEvent } from '../util';
 import { toGitUri } from '../uri';
@@ -193,8 +193,16 @@ export class ApiRepository implements Repository {
 		return this._repository.renameRemote(name, newName);
 	}
 
-	fetch(remote?: string | undefined, ref?: string | undefined, depth?: number | undefined): Promise<void> {
-		return this._repository.fetch(remote, ref, depth);
+	fetch(arg0?: FetchOptions | string | undefined,
+		ref?: string | undefined,
+		depth?: number | undefined,
+		prune?: boolean | undefined
+	): Promise<void> {
+		if (arg0 !== undefined && typeof arg0 !== 'string') {
+			return this._repository.fetch(arg0);
+		}
+
+		return this._repository.fetch({ remote: arg0, ref, depth, prune });
 	}
 
 	pull(unshallow?: boolean): Promise<void> {

extensions/git/src/api/git.d.ts

@@ -139,6 +139,14 @@ export interface CommitOptions {
 	requireUserConfig?: boolean;
 }
 
+export interface FetchOptions {
+	remote?: string;
+	ref?: string;
+	all?: boolean;
+	prune?: boolean;
+	depth?: number;
+}
+
 export interface BranchQuery {
 	readonly remote?: boolean;
 	readonly pattern?: string;
@@ -197,6 +205,7 @@ export interface Repository {
 	removeRemote(name: string): Promise<void>;
 	renameRemote(name: string, newName: string): Promise<void>;
 
+	fetch(options?: FetchOptions): Promise<void>;
 	fetch(remote?: string, ref?: string, depth?: number): Promise<void>;
 	pull(unshallow?: boolean): Promise<void>;
 	push(remoteName?: string, branchName?: string, setUpstream?: boolean, force?: ForcePushMode): Promise<void>;

extensions/git/src/commands.ts

@@ -2246,8 +2246,8 @@ export class CommandCenter {
 			return;
 		}
 
-		await repository.addRemote(name, url);
-		await repository.fetch(name);
+		await repository.addRemote(name, url.trim());
+		await repository.fetch({ remote: name });
 		return name;
 	}
 

extensions/git/src/git.ts

@@ -1638,7 +1638,7 @@ export class Repository {
 				err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
 			} else if (/Could not read from remote repository/.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.RemoteConnectionError;
-			} else if (/Pull is not possible because you have unmerged files|Cannot pull with rebase: You have unstaged changes|Your local changes to the following files would be overwritten|Please, commit your changes before you can merge/i.test(err.stderr)) {
+			} else if (/Pull(?:ing)? is not possible because you have unmerged files|Cannot pull with rebase: You have unstaged changes|Your local changes to the following files would be overwritten|Please, commit your changes before you can merge/i.test(err.stderr)) {
 				err.stderr = err.stderr.replace(/Cannot pull with rebase: You have unstaged changes/i, 'Cannot pull with rebase, you have unstaged changes');
 				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
 			} else if (/cannot lock ref|unable to update local ref/i.test(err.stderr || '')) {

extensions/git/src/model.ts

@@ -284,8 +284,9 @@ export class Model implements IRemoteSourceProviderRegistry, IPushErrorHandlerRe
 
 			this.open(repository);
 			await repository.status();
-		} catch (err) {
+		} catch (ex) {
 			// noop
+			this.outputChannel.appendLine(`Opening repository for path='${path}' failed; ex=${ex}`);
 		}
 	}
 

extensions/git/src/repository.ts

@@ -7,7 +7,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { CancellationToken, Command, Disposable, Event, EventEmitter, Memento, OutputChannel, ProgressLocation, ProgressOptions, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, ThemeColor, Uri, window, workspace, WorkspaceEdit, FileDecoration, commands } from 'vscode';
 import * as nls from 'vscode-nls';
-import { Branch, Change, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status, CommitOptions, BranchQuery } from './api/git';
+import { Branch, Change, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status, CommitOptions, BranchQuery, FetchOptions } from './api/git';
 import { AutoFetcher } from './autofetch';
 import { debounce, memoize, throttle } from './decorators';
 import { Commit, GitError, Repository as BaseRepository, Stash, Submodule, LogFileOptions } from './git';
@@ -1319,8 +1319,8 @@ export class Repository implements Disposable {
 		await this._fetch({ all: true });
 	}
 
-	async fetch(remote?: string, ref?: string, depth?: number): Promise<void> {
-		await this._fetch({ remote, ref, depth });
+	async fetch(options: FetchOptions): Promise<void> {
+		await this._fetch(options);
 	}
 
 	private async _fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean; } = {}): Promise<void> {

extensions/git/src/test/index.ts

@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 

extensions/git/yarn.lock

@@ -36,24 +36,57 @@
   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
   integrity sha1-AW44dim4gXvtZT/jLqtdESecjfY=
 
-applicationinsights@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
-  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
+applicationinsights@1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.7.4.tgz#e7d96435594d893b00cf49f70a5927105dbb8749"
+  integrity sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==
   dependencies:
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
     diagnostic-channel "0.2.0"
-    diagnostic-channel-publishers "0.2.1"
-    zone.js "0.7.6"
+    diagnostic-channel-publishers "^0.3.3"
+
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
 
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
   integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
 
-diagnostic-channel-publishers@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
-  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
+diagnostic-channel-publishers@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
+  integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
 
 diagnostic-channel@0.2.0:
   version "0.2.0"
@@ -62,6 +95,13 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 file-type@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-7.2.0.tgz#113cfed52e1d6959ab80248906e2f25a8cdccb74"
@@ -87,12 +127,27 @@ semver@^5.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-vscode-extension-telemetry@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
-  integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA==
+semver@^5.4.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
+
+vscode-extension-telemetry@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.7.tgz#18389bc24127c89dade29cd2b71ba69a6ee6ad26"
+  integrity sha512-pZuZTHO9OpsrwlerOKotWBRLRYJ53DobYb7aWiRAXjlqkuqE+YJJaP+2WEy8GrLIF1EnitXTDMaTAKsmLQ5ORQ==
   dependencies:
-    applicationinsights "1.0.8"
+    applicationinsights "1.7.4"
 
 vscode-nls@^4.0.0:
   version "4.0.0"
@@ -110,8 +165,3 @@ which@^1.3.0:
   integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==
   dependencies:
     isexe "^2.0.0"
-
-zone.js@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=

extensions/github-authentication/package.json

@@ -55,7 +55,7 @@
   "dependencies": {
     "node-fetch": "2.6.1",
     "uuid": "8.1.0",
-    "vscode-extension-telemetry": "0.1.1",
+    "vscode-extension-telemetry": "0.1.7",
     "vscode-nls": "^4.1.2"
   },
   "devDependencies": {

extensions/github-authentication/src/githubServer.ts

@@ -94,9 +94,12 @@ export class GitHubServer {
 
 		return Promise.race([
 			codeExchangePromise.promise,
-			promiseFromEvent<string | undefined, string>(onDidManuallyProvideToken.event, (token: string | undefined): string => {
-				if (!token) { throw new Error('Cancelled'); }
-				return token;
+			promiseFromEvent<string | undefined, string>(onDidManuallyProvideToken.event, (token: string | undefined, resolve, reject): void => {
+				if (!token) {
+					reject('Cancelled');
+				} else {
+					resolve(token);
+				}
 			}).promise
 		]).finally(() => {
 			this._pendingStates.delete(scopes);

extensions/github-authentication/yarn.lock

@@ -25,20 +25,45 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
   integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
 
-applicationinsights@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
-  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
+applicationinsights@1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.7.4.tgz#e7d96435594d893b00cf49f70a5927105dbb8749"
+  integrity sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==
   dependencies:
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
     diagnostic-channel "0.2.0"
-    diagnostic-channel-publishers "0.2.1"
-    zone.js "0.7.6"
+    diagnostic-channel-publishers "^0.3.3"
+
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -46,15 +71,23 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-diagnostic-channel-publishers@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
-  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=
+diagnostic-channel-publishers@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
+  integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
 
 diagnostic-channel@0.2.0:
   version "0.2.0"
@@ -63,6 +96,13 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -89,29 +129,34 @@ node-fetch@2.6.1:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-semver@^5.3.0:
+semver@^5.3.0, semver@^5.4.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
+
 uuid@8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
   integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
 
-vscode-extension-telemetry@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
-  integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA==
+vscode-extension-telemetry@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.7.tgz#18389bc24127c89dade29cd2b71ba69a6ee6ad26"
+  integrity sha512-pZuZTHO9OpsrwlerOKotWBRLRYJ53DobYb7aWiRAXjlqkuqE+YJJaP+2WEy8GrLIF1EnitXTDMaTAKsmLQ5ORQ==
   dependencies:
-    applicationinsights "1.0.8"
+    applicationinsights "1.7.4"
 
 vscode-nls@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
   integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
-
-zone.js@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=

extensions/github/src/publish.ts

@@ -168,7 +168,12 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 	}
 
 	const githubRepository = await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, cancellable: false, title: 'Publish to GitHub' }, async progress => {
-		progress.report({ message: `Publishing to GitHub ${isPrivate ? 'private' : 'public'} repository`, increment: 25 });
+		progress.report({
+			message: isPrivate
+				? localize('publishing_private', "Publishing to a private GitHub repository")
+				: localize('publishing_public', "Publishing to a public GitHub repository"),
+			increment: 25
+		});
 
 		const res = await octokit.repos.createForAuthenticatedUser({
 			name: repo!,
@@ -177,7 +182,7 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 
 		const createdGithubRepository = res.data;
 
-		progress.report({ message: 'Creating first commit', increment: 25 });
+		progress.report({ message: localize('publishing_firstcommit', "Creating first commit"), increment: 25 });
 
 		if (!repository) {
 			repository = await gitAPI.init(folder) || undefined;
@@ -189,7 +194,8 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 			await repository.commit('first commit', { all: true });
 		}
 
-		progress.report({ message: 'Uploading files', increment: 25 });
+		progress.report({ message: localize('publishing_uploading', "Uploading files"), increment: 25 });
+
 		const branch = await repository.getBranch('HEAD');
 		await repository.addRemote('origin', createdGithubRepository.clone_url);
 		await repository.push('origin', branch.name, true);
@@ -201,9 +207,9 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
 		return;
 	}
 
-	const openInGitHub = 'Open In GitHub';
-	vscode.window.showInformationMessage(`Successfully published the '${owner}/${repo}' repository on GitHub.`, openInGitHub).then(action => {
-		if (action === openInGitHub) {
+	const openOnGitHub = localize('openingithub', "Open on GitHub");
+	vscode.window.showInformationMessage(localize('publishing_done', "Successfully published the '{0}' repository to GitHub.", `${owner}/${repo}`), openOnGitHub).then(action => {
+		if (action === openOnGitHub) {
 			vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(githubRepository.html_url));
 		}
 	});

extensions/github/src/pushErrorHandler.ts

@@ -3,37 +3,95 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PushErrorHandler, GitErrorCodes, Repository, Remote } from './typings/git';
-import { window, ProgressLocation, commands, Uri } from 'vscode';
+import { commands, env, ProgressLocation, UIKind, Uri, window } from 'vscode';
 import * as nls from 'vscode-nls';
 import { getOctokit } from './auth';
+import { GitErrorCodes, PushErrorHandler, Remote, Repository } from './typings/git';
 
 const localize = nls.loadMessageBundle();
 
+type Awaited<T> = T extends PromiseLike<infer U> ? Awaited<U> : T;
+
+export function isInCodespaces(): boolean {
+	return env.remoteName === 'codespaces';
+}
+
 async function handlePushError(repository: Repository, remote: Remote, refspec: string, owner: string, repo: string): Promise<void> {
+	const inCodespaces = isInCodespaces();
+	let codespace: string | undefined;
+	if (inCodespaces) {
+		if (env.uiKind === UIKind.Web) {
+			// TODO@eamodio Find a better way to get the codespace id
+			// HACK to get the codespace id
+			try {
+				const codespaceUrl = (await env.asExternalUri(Uri.parse(`${env.uriScheme}://codespace/`))).authority;
+				if (codespaceUrl.endsWith('.github.dev')) {
+					codespace = codespaceUrl.slice(0, -11);
+				} else {
+					[codespace] = codespaceUrl.split('.');
+				}
+			} catch { }
+		} else {
+			// Call into the codespaces extension to get the codespace id
+			const info = await commands.executeCommand<{ name: string } | undefined>('github.codespaces.getCurrentCodespace');
+			codespace = info?.name;
+		}
+
+		if (!codespace) {
+			const ok = localize('ok', "OK");
+			await window.showErrorMessage(localize('fork unable', "You don't have permissions to push to '{0}/{1}' on GitHub.", owner, repo), ok);
+			return;
+		}
+	}
+
 	const yes = localize('create a fork', "Create Fork");
 	const no = localize('no', "No");
 
 	const answer = await window.showInformationMessage(localize('fork', "You don't have permissions to push to '{0}/{1}' on GitHub. Would you like to create a fork and push to it instead?", owner, repo), yes, no);
-
 	if (answer === no) {
 		return;
 	}
 
 	const match = /^([^:]*):([^:]*)$/.exec(refspec);
 	const localName = match ? match[1] : refspec;
-	const remoteName = match ? match[2] : refspec;
+	let remoteName = match ? match[2] : refspec;
 
 	const [octokit, ghRepository] = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: localize('create fork', 'Create GitHub fork') }, async progress => {
 		progress.report({ message: localize('forking', "Forking '{0}/{1}'...", owner, repo), increment: 33 });
 
 		const octokit = await getOctokit();
 
-		// Issue: what if the repo already exists?
-		const res = await octokit.repos.createFork({ owner, repo });
-		const ghRepository = res.data;
+		type CreateForkResponseData = Awaited<ReturnType<typeof octokit.repos.createFork>>['data'];
 
-		progress.report({ message: localize('pushing', "Pushing changes..."), increment: 33 });
+		// Issue: what if the repo already exists?
+		let ghRepository: CreateForkResponseData;
+		try {
+			if (inCodespaces) {
+				const userResp = await octokit.users.getAuthenticated();
+				const user = userResp.data.login;
+
+				const resp = await octokit.request<{ repository: CreateForkResponseData, ref: string }>({ method: 'POST', url: `/vscs_internal/user/${user}/codespaces/${codespace}/fork_repo` });
+				ghRepository = resp.data.repository;
+
+				if (resp.data.ref) {
+					let ref = resp.data.ref;
+					if (ref.startsWith('refs/heads/')) {
+						ref = ref.substr(11);
+					}
+
+					remoteName = ref;
+				}
+			} else {
+				const resp = await octokit.repos.createFork({ owner, repo });
+				ghRepository = resp.data;
+			}
+		} catch (ex) {
+			console.error(ex);
+			throw ex;
+		}
+
+
+		progress.report({ message: localize('forking_pushing', "Pushing changes..."), increment: 33 });
 
 		// Issue: what if there's already an `upstream` repo?
 		await repository.renameRemote(remote.name, 'upstream');
@@ -55,11 +113,11 @@ async function handlePushError(repository: Repository, remote: Remote, refspec:
 
 	// yield
 	(async () => {
-		const openInGitHub = localize('openingithub', "Open In GitHub");
+		const openOnGitHub = localize('openingithub', "Open on GitHub");
 		const createPR = localize('createpr', "Create PR");
-		const action = await window.showInformationMessage(localize('done', "The fork '{0}' was successfully created on GitHub.", ghRepository.full_name), openInGitHub, createPR);
+		const action = await window.showInformationMessage(localize('forking_done', "The fork '{0}' was successfully created on GitHub.", ghRepository.full_name), openOnGitHub, createPR);
 
-		if (action === openInGitHub) {
+		if (action === openOnGitHub) {
 			await commands.executeCommand('vscode.open', Uri.parse(ghRepository.html_url));
 		} else if (action === createPR) {
 			const pr = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: localize('createghpr', "Creating GitHub Pull Request...") }, async _ => {
@@ -103,12 +161,13 @@ export class GithubPushErrorHandler implements PushErrorHandler {
 			return false;
 		}
 
-		if (!remote.pushUrl) {
+		const remoteUrl = remote.pushUrl || (isInCodespaces() ? remote.fetchUrl : undefined);
+		if (!remoteUrl) {
 			return false;
 		}
 
-		const match = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\.git/i.exec(remote.pushUrl)
-			|| /^git@github\.com:([^/]+)\/([^/]+)\.git/i.exec(remote.pushUrl);
+		const match = /^https:\/\/github\.com\/([^/]+)\/([^/]+)(?:\.git)?/i.exec(remoteUrl)
+			|| /^git@github\.com:([^/]+)\/([^/]+)(?:\.git)?/i.exec(remoteUrl);
 
 		if (!match) {
 			return false;

extensions/github/src/remoteSourceProvider.ts

@@ -76,7 +76,7 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider {
 			return [];
 		}
 
-		const raw = await octokit.search.repos({ q: query, sort: 'updated' });
+		const raw = await octokit.search.repos({ q: query, sort: 'stars' });
 		return raw.data.items.map(asRemoteSource);
 	}
 

extensions/html-language-features/client/src/htmlClient.ts

@@ -199,7 +199,7 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 
 	languages.setLanguageConfiguration('html', {
 		indentationRules: {
-			increaseIndentPattern: /<(?!\?|(?:area|base|br|col|frame|hr|html|img|input|link|meta|param)\b|[^>]*\/>)([-_\.A-Za-z0-9]+)(?=\s|>)\b[^>]*>(?!.*<\/\1>)|<!--(?!.*-->)|\{[^}"']*$/,
+			increaseIndentPattern: /<(?!\?|(?:area|base|br|col|frame|hr|html|img|input|keygen|link|menuitem|meta|param|source|track|wbr)\b|[^>]*\/>)([-_\.A-Za-z0-9]+)(?=\s|>)\b[^>]*>(?!.*<\/\1>)|<!--(?!.*-->)|\{[^}"']*$/,
 			decreaseIndentPattern: /^\s*(<\/(?!html)[-_\.A-Za-z0-9]+\b[^>]*>|-->|\})/
 		},
 		wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,

extensions/html-language-features/package.json

@@ -234,7 +234,7 @@
     ]
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.1.1",
+    "vscode-extension-telemetry": "0.1.7",
     "vscode-languageclient": "^7.0.0",
     "vscode-nls": "^5.0.0"
   },

extensions/html-language-features/package.nls.json

@@ -18,7 +18,7 @@
 	"html.format.wrapAttributes.forcealign": "Wrap each attribute except first and keep aligned.",
 	"html.format.wrapAttributes.forcemultiline": "Wrap each attribute.",
 	"html.format.wrapAttributes.alignedmultiple": "Wrap when line length is exceeded, align attributes vertically.",
-	"html.format.wrapAttributes.preserve": "Preserve wrapping of attributes",
+	"html.format.wrapAttributes.preserve": "Preserve wrapping of attributes.",
 	"html.format.wrapAttributes.preservealigned": "Preserve wrapping of attributes but align.",
 	"html.format.templating.desc": "Honor django, erb, handlebars and php templating language tags.",
 	"html.format.unformattedContentDelimiter.desc": "Keep text content together between this string.",

extensions/html-language-features/server/package.json

@@ -10,7 +10,8 @@
   "main": "./out/node/htmlServerMain",
   "dependencies": {
     "vscode-css-languageservice": "^5.1.0",
-    "vscode-html-languageservice": "^4.0.1",
+    "vscode-html-languageservice": "^4.0.2",
+    "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-languageserver": "^7.0.0",
     "vscode-nls": "^5.0.0",
     "vscode-uri": "^3.0.2"

extensions/html-language-features/server/src/modes/javascriptMode.ts

@@ -65,9 +65,7 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 			return compilerOptions;
 		},
 		dispose() {
-			if (jsLanguageService) {
-				jsLanguageService.then(s => s.dispose());
-			}
+			jsLanguageService.then(s => s.dispose());
 		}
 	};
 }

extensions/html-language-features/server/src/modes/languageModes.ts

@@ -5,12 +5,17 @@
 
 import { getCSSLanguageService } from 'vscode-css-languageservice';
 import {
-	ClientCapabilities, DocumentContext, getLanguageService as getHTMLLanguageService, IHTMLDataProvider, SelectionRange,
-	CompletionItem, CompletionList, Definition, Diagnostic, DocumentHighlight, DocumentLink, FoldingRange, FormattingOptions,
-	Hover, Location, Position, Range, SignatureHelp, SymbolInformation, TextDocument, TextEdit,
-	Color, ColorInformation, ColorPresentation, WorkspaceEdit
+	DocumentContext, getLanguageService as getHTMLLanguageService, IHTMLDataProvider, ClientCapabilities
 } from 'vscode-html-languageservice';
-import { WorkspaceFolder } from 'vscode-languageserver';
+import {
+	SelectionRange,
+	CompletionItem, CompletionList, Definition, Diagnostic, DocumentHighlight, DocumentLink, FoldingRange, FormattingOptions,
+	Hover, Location, Position, Range, SignatureHelp, SymbolInformation, TextEdit,
+	Color, ColorInformation, ColorPresentation, WorkspaceEdit,
+	WorkspaceFolder
+} from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+
 import { getLanguageModelCache, LanguageModelCache } from '../languageModelCache';
 import { getCSSMode } from './cssMode';
 import { getDocumentRegions, HTMLDocumentRegions } from './embeddedSupport';
@@ -18,8 +23,18 @@ import { getHTMLMode } from './htmlMode';
 import { getJavaScriptMode } from './javascriptMode';
 import { RequestService } from '../requests';
 
-export * from 'vscode-html-languageservice';
-export { WorkspaceFolder } from 'vscode-languageserver';
+export {
+	WorkspaceFolder, CompletionItem, CompletionList, CompletionItemKind, Definition, Diagnostic, DocumentHighlight, DocumentHighlightKind,
+	DocumentLink, FoldingRange, FoldingRangeKind, FormattingOptions,
+	Hover, Location, Position, Range, SignatureHelp, SymbolInformation, SymbolKind, TextEdit,
+	Color, ColorInformation, ColorPresentation, WorkspaceEdit,
+	SignatureInformation, ParameterInformation, DiagnosticSeverity,
+	SelectionRange, TextDocumentIdentifier
+} from 'vscode-languageserver';
+
+export { ClientCapabilities, DocumentContext, LanguageService, HTMLDocument, HTMLFormatConfiguration, TokenType } from 'vscode-html-languageservice';
+
+export { TextDocument } from 'vscode-languageserver-textdocument';
 
 export interface Settings {
 	css?: any;

extensions/html-language-features/server/yarn.lock

@@ -22,10 +22,10 @@ vscode-css-languageservice@^5.1.0:
     vscode-nls "^5.0.0"
     vscode-uri "^3.0.2"
 
-vscode-html-languageservice@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.0.1.tgz#6fb50fcf782937dffe0de55e12a8c43c817ec0f1"
-  integrity sha512-CZtnuQoDwZdmPLKLMC6RqFlRTw0jvZK71l53u5ZIM3hSoVKAqW33gahBVNFpC3TPFxZSx0jqEhBTLf37RUMkWg==
+vscode-html-languageservice@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.0.2.tgz#e0a02975b7795b409b13a545b8954c0b6e5e8345"
+  integrity sha512-Kin07sTZ9FkZNcNMXtoUkmmDtZHsp1hShatFUvqx07ySz1BeXDyWyvdWY/fxk2Mc/ApfQ9rmK8YyhqUotLZ8GQ==
   dependencies:
     vscode-languageserver-textdocument "^1.0.1"
     vscode-languageserver-types "^3.16.0"

extensions/html-language-features/yarn.lock

@@ -7,14 +7,30 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
   integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
-applicationinsights@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
-  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
+applicationinsights@1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.7.4.tgz#e7d96435594d893b00cf49f70a5927105dbb8749"
+  integrity sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==
   dependencies:
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
     diagnostic-channel "0.2.0"
-    diagnostic-channel-publishers "0.2.1"
-    zone.js "0.7.6"
+    diagnostic-channel-publishers "^0.3.3"
+
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -29,15 +45,32 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-diagnostic-channel-publishers@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
-  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
+diagnostic-channel-publishers@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
+  integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
 
 diagnostic-channel@0.2.0:
   version "0.2.0"
@@ -46,6 +79,13 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -65,6 +105,11 @@ semver@^5.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
+semver@^5.4.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^7.3.4:
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
@@ -72,12 +117,22 @@ semver@^7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-vscode-extension-telemetry@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
-  integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA==
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
+
+vscode-extension-telemetry@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.7.tgz#18389bc24127c89dade29cd2b71ba69a6ee6ad26"
+  integrity sha512-pZuZTHO9OpsrwlerOKotWBRLRYJ53DobYb7aWiRAXjlqkuqE+YJJaP+2WEy8GrLIF1EnitXTDMaTAKsmLQ5ORQ==
   dependencies:
-    applicationinsights "1.0.8"
+    applicationinsights "1.7.4"
 
 vscode-jsonrpc@6.0.0:
   version "6.0.0"
@@ -115,8 +170,3 @@ yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-zone.js@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=

extensions/image-preview/package.json

@@ -55,12 +55,12 @@
       "commandPalette": [
         {
           "command": "imagePreview.zoomIn",
-          "when": "imagePreviewFocus",
+          "when": "activeCustomEditorId == 'imagePreview.previewEditor'",
           "group": "1_imagePreview"
         },
         {
           "command": "imagePreview.zoomOut",
-          "when": "imagePreviewFocus",
+          "when": "activeCustomEditorId == 'imagePreview.previewEditor'",
           "group": "1_imagePreview"
         }
       ]
@@ -75,7 +75,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.1.1",
+    "vscode-extension-telemetry": "0.1.7",
     "vscode-nls": "^4.0.0"
   },
   "repository": {

extensions/image-preview/yarn.lock

@@ -2,19 +2,52 @@
 # yarn lockfile v1
 
 
-applicationinsights@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
-  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
+applicationinsights@1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.7.4.tgz#e7d96435594d893b00cf49f70a5927105dbb8749"
+  integrity sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==
   dependencies:
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
     diagnostic-channel "0.2.0"
-    diagnostic-channel-publishers "0.2.1"
-    zone.js "0.7.6"
+    diagnostic-channel-publishers "^0.3.3"
 
-diagnostic-channel-publishers@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
-  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
+
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
+diagnostic-channel-publishers@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
+  integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
 
 diagnostic-channel@0.2.0:
   version "0.2.0"
@@ -23,24 +56,41 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-vscode-extension-telemetry@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
-  integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA==
+semver@^5.4.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
+
+vscode-extension-telemetry@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.7.tgz#18389bc24127c89dade29cd2b71ba69a6ee6ad26"
+  integrity sha512-pZuZTHO9OpsrwlerOKotWBRLRYJ53DobYb7aWiRAXjlqkuqE+YJJaP+2WEy8GrLIF1EnitXTDMaTAKsmLQ5ORQ==
   dependencies:
-    applicationinsights "1.0.8"
+    applicationinsights "1.7.4"
 
 vscode-nls@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
   integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
-
-zone.js@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=

extensions/json-language-features/package.json

@@ -129,7 +129,7 @@
   },
   "dependencies": {
     "request-light": "^0.4.0",
-    "vscode-extension-telemetry": "0.1.1",
+    "vscode-extension-telemetry": "0.1.7",
     "vscode-languageclient": "^7.0.0",
     "vscode-nls": "^5.0.0"
   },

extensions/json-language-features/package.nls.json

@@ -1,7 +1,7 @@
 {
 	"displayName": "JSON Language Features",
 	"description": "Provides rich language support for JSON files.",
-	"json.schemas.desc": "Associate schemas to JSON files in the current project",
+	"json.schemas.desc": "Associate schemas to JSON files in the current project.",
 	"json.schemas.url.desc": "A URL to a schema or a relative path to a schema in the current directory",
 	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas. `*` can be used as a wildcard. Exclusion patterns can also be defined and start with '!'. A file matches when there is at least one matching pattern and the last matching pattern is not an exclusion pattern.",
 	"json.schemas.fileMatch.item.desc": "A file pattern that can contain '*' to match against when resolving JSON files to schemas.",

extensions/json-language-features/yarn.lock

@@ -21,14 +21,30 @@ agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
-applicationinsights@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
-  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
+applicationinsights@1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.7.4.tgz#e7d96435594d893b00cf49f70a5927105dbb8749"
+  integrity sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==
   dependencies:
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
     diagnostic-channel "0.2.0"
-    diagnostic-channel-publishers "0.2.1"
-    zone.js "0.7.6"
+    diagnostic-channel-publishers "^0.3.3"
+
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -43,11 +59,28 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
 debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -62,10 +95,10 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-diagnostic-channel-publishers@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
-  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=
+diagnostic-channel-publishers@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
+  integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
 
 diagnostic-channel@0.2.0:
   version "0.2.0"
@@ -74,6 +107,13 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 es6-promise@^4.0.3:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
@@ -140,6 +180,11 @@ semver@^5.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
+semver@^5.4.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^7.3.4:
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
@@ -147,12 +192,22 @@ semver@^7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-vscode-extension-telemetry@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
-  integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA==
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
+
+vscode-extension-telemetry@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.7.tgz#18389bc24127c89dade29cd2b71ba69a6ee6ad26"
+  integrity sha512-pZuZTHO9OpsrwlerOKotWBRLRYJ53DobYb7aWiRAXjlqkuqE+YJJaP+2WEy8GrLIF1EnitXTDMaTAKsmLQ5ORQ==
   dependencies:
-    applicationinsights "1.0.8"
+    applicationinsights "1.7.4"
 
 vscode-jsonrpc@6.0.0:
   version "6.0.0"
@@ -195,8 +250,3 @@ yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-zone.js@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=

extensions/julia/language-configuration.json

@@ -27,5 +27,9 @@
 			"start": "^\\s*#region",
 			"end": "^\\s*#endregion"
 		}
+	},
+	"indentationRules": {
+		"increaseIndentPattern": "^(\\s*|.*=\\s*|.*@\\w*\\s*)[\\w\\s]*(?:[\"'`][^\"'`]*[\"'`])*[\\w\\s]*\\b(if|while|for|function|macro|(mutable\\s+)?struct|abstract\\s+type|primitive\\s+type|let|quote|try|begin|.*\\)\\s*do|else|elseif|catch|finally)\\b(?!(?:.*\\bend\\b[^\\]]*)|(?:[^\\[]*\\].*)$).*$",
+		"decreaseIndentPattern": "^\\s*(end|else|elseif|catch|finally)\\b.*$"
 	}
 }

extensions/julia/package.json

@@ -9,7 +9,7 @@
 		"vscode": "0.10.x"
 	},
   "scripts": {
-    "update-grammar": "node ../node_modules/.bin/vscode-grammar-updater JuliaEditorSupport/atom-language-julia grammars/julia_vscode.json ./syntaxes/julia.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin JuliaEditorSupport/atom-language-julia grammars/julia_vscode.json ./syntaxes/julia.tmLanguage.json"
   },
 	"contributes": {
 		"languages": [

extensions/make/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "fadeevab/make.tmbundle",
 					"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
-					"commitHash": "e36e02becd20730259b0115d9ca5c419f65023a9"
+					"commitHash": "91b724d1ad86fa65e4b240a960311a280b92f971"
 				}
 			},
 			"licenseDetail": [

extensions/make/syntaxes/make.tmLanguage.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/fadeevab/make.tmbundle/commit/e36e02becd20730259b0115d9ca5c419f65023a9",
+	"version": "https://github.com/fadeevab/make.tmbundle/commit/91b724d1ad86fa65e4b240a960311a280b92f971",
 	"name": "Makefile",
 	"scopeName": "source.makefile",
 	"patterns": [
@@ -29,7 +29,7 @@
 	],
 	"repository": {
 		"comment": {
-			"begin": "(^[ \\t]+)?(?=#)",
+			"begin": "(^[ ]+)?(?=#)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.whitespace.comment.leading.makefile"
@@ -130,9 +130,6 @@
 						{
 							"include": "#variables"
 						},
-						{
-							"include": "#comment"
-						},
 						{
 							"include": "#directives"
 						}
@@ -195,37 +192,7 @@
 					]
 				},
 				{
-					"begin": "^\\s*(ifdef|ifndef)\\s*([^\\s]+)(?=\\s)",
-					"captures": {
-						"1": {
-							"name": "keyword.control.$1.makefile"
-						},
-						"2": {
-							"name": "variable.other.makefile"
-						},
-						"3": {
-							"name": "punctuation.separator.key-value.makefile"
-						}
-					},
-					"end": "^\\s*(endif)\\b",
-					"name": "meta.scope.conditional.makefile",
-					"patterns": [
-						{
-							"begin": "\\G(?!\\n)",
-							"end": "^",
-							"patterns": [
-								{
-									"include": "#comment"
-								}
-							]
-						},
-						{
-							"include": "$self"
-						}
-					]
-				},
-				{
-					"begin": "^\\s*(ifeq|ifneq)(?=\\s)",
+					"begin": "^\\s*(ifeq|ifneq|ifdef|ifndef)(?=\\s)",
 					"captures": {
 						"1": {
 							"name": "keyword.control.$1.makefile"
@@ -254,7 +221,15 @@
 									"name": "keyword.control.else.makefile"
 								}
 							},
-							"end": "^"
+							"end": "^",
+							"patterns": [
+								{
+									"include": "#variables"
+								},
+								{
+									"include": "#comment"
+								}
+							]
 						},
 						{
 							"include": "$self"

extensions/markdown-language-features/.gitignore

@@ -0,0 +1,2 @@
+notebook-out
+media/*.js

extensions/markdown-language-features/media/pre.js

@@ -1 +0,0 @@
-!function(e){var t={};function n(o){if(t[o])return t[o].exports;var s=t[o]={i:o,l:!1,exports:{}};return e[o].call(s.exports,s,s.exports,n),s.l=!0,s.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var s in e)n.d(o,s,function(t){return e[t]}.bind(null,s));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=11)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getSettings=t.getData=void 0;let o=void 0;function s(e){const t=document.getElementById("vscode-markdown-preview-data");if(t){const n=t.getAttribute(e);if(n)return JSON.parse(n)}throw new Error("Could not load data for "+e)}t.getData=s,t.getSettings=function(){if(o)return o;if(o=s("data-settings"),o)return o;throw new Error("Could not load settings")}},,,,,,,,,,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});const o=n(12),s=n(14);window.cspAlerter=new o.CspAlerter,window.styleLoadingMonitor=new s.StyleLoadingMonitor},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.CspAlerter=void 0;const o=n(0),s=n(13);t.CspAlerter=class{constructor(){this.didShow=!1,this.didHaveCspWarning=!1,document.addEventListener("securitypolicyviolation",()=>{this.onCspWarning()}),window.addEventListener("message",e=>{e&&e.data&&"vscode-did-block-svg"===e.data.name&&this.onCspWarning()})}setPoster(e){this.messaging=e,this.didHaveCspWarning&&this.showCspWarning()}onCspWarning(){this.didHaveCspWarning=!0,this.showCspWarning()}showCspWarning(){const e=s.getStrings(),t=o.getSettings();if(this.didShow||t.disableSecurityWarnings||!this.messaging)return;this.didShow=!0;const n=document.createElement("a");n.innerText=e.cspAlertMessageText,n.setAttribute("id","code-csp-warning"),n.setAttribute("title",e.cspAlertMessageTitle),n.setAttribute("role","button"),n.setAttribute("aria-label",e.cspAlertMessageLabel),n.onclick=()=>{this.messaging.postMessage("showPreviewSecuritySelector",{source:t.source})},document.body.appendChild(n)}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getStrings=void 0,t.getStrings=function(){const e=document.getElementById("vscode-markdown-preview-data");if(e){const t=e.getAttribute("data-strings");if(t)return JSON.parse(t)}throw new Error("Could not load strings")}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.StyleLoadingMonitor=void 0;t.StyleLoadingMonitor=class{constructor(){this.unloadedStyles=[],this.finishedLoading=!1;const e=e=>{const t=e.target.dataset.source;this.unloadedStyles.push(t)};window.addEventListener("DOMContentLoaded",()=>{for(const t of document.getElementsByClassName("code-user-style"))t.dataset.source&&(t.onerror=e)}),window.addEventListener("load",()=>{this.unloadedStyles.length&&(this.finishedLoading=!0,this.poster&&this.poster.postMessage("previewStyleLoadError",{unloadedStyles:this.unloadedStyles}))})}setPoster(e){this.poster=e,this.finishedLoading&&e.postMessage("previewStyleLoadError",{unloadedStyles:this.unloadedStyles})}}}]);

extensions/markdown-language-features/package.json

@@ -335,7 +335,7 @@
     "highlight.js": "^10.4.1",
     "markdown-it": "^12.0.3",
     "markdown-it-front-matter": "^0.2.1",
-    "vscode-extension-telemetry": "0.1.1",
+    "vscode-extension-telemetry": "0.1.7",
     "vscode-nls": "^4.0.0"
   },
   "devDependencies": {

extensions/markdown-language-features/package.nls.json

@@ -1,28 +1,28 @@
 {
 	"displayName": "Markdown Language Features",
 	"description": "Provides rich language support for Markdown.",
-	"markdown.preview.breaks.desc": "Sets how line-breaks are rendered in the markdown preview. Setting it to 'true' creates a <br> for newlines inside paragraphs.",
-	"markdown.preview.linkify": "Enable or disable conversion of URL-like text to links in the markdown preview.",
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double click in the markdown preview to switch to the editor.",
-	"markdown.preview.fontFamily.desc": "Controls the font family used in the markdown preview.",
-	"markdown.preview.fontSize.desc": "Controls the font size in pixels used in the markdown preview.",
-	"markdown.preview.lineHeight.desc": "Controls the line height used in the markdown preview. This number is relative to the font size.",
-	"markdown.preview.markEditorSelection.desc": "Mark the current editor selection in the markdown preview.",
-	"markdown.preview.scrollEditorWithPreview.desc": "When a markdown preview is scrolled, update the view of the editor.",
-	"markdown.preview.scrollPreviewWithEditor.desc": "When a markdown editor is scrolled, update the view of the preview.",
+	"markdown.preview.breaks.desc": "Sets how line-breaks are rendered in the Markdown preview. Setting it to 'true' creates a <br> for newlines inside paragraphs.",
+	"markdown.preview.linkify": "Enable or disable conversion of URL-like text to links in the Markdown preview.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double click in the Markdown preview to switch to the editor.",
+	"markdown.preview.fontFamily.desc": "Controls the font family used in the Markdown preview.",
+	"markdown.preview.fontSize.desc": "Controls the font size in pixels used in the Markdown preview.",
+	"markdown.preview.lineHeight.desc": "Controls the line height used in the Markdown preview. This number is relative to the font size.",
+	"markdown.preview.markEditorSelection.desc": "Mark the current editor selection in the Markdown preview.",
+	"markdown.preview.scrollEditorWithPreview.desc": "When a Markdown preview is scrolled, update the view of the editor.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "When a Markdown editor is scrolled, update the view of the preview.",
 	"markdown.preview.title": "Open Preview",
 	"markdown.previewSide.title": "Open Preview to the Side",
 	"markdown.showLockedPreviewToSide.title": "Open Locked Preview to the Side",
 	"markdown.showSource.title": "Show Source",
-	"markdown.styles.dec": "A list of URLs or local paths to CSS style sheets to use from the markdown preview. Relative paths are interpreted relative to the folder open in the explorer. If there is no open folder, they are interpreted relative to the location of the markdown file. All '\\' need to be written as '\\\\'.",
+	"markdown.styles.dec": "A list of URLs or local paths to CSS style sheets to use from the Markdown preview. Relative paths are interpreted relative to the folder open in the explorer. If there is no open folder, they are interpreted relative to the location of the Markdown file. All '\\' need to be written as '\\\\'.",
 	"markdown.showPreviewSecuritySelector.title": "Change Preview Security Settings",
-	"markdown.trace.desc": "Enable debug logging for the markdown extension.",
+	"markdown.trace.desc": "Enable debug logging for the Markdown extension.",
 	"markdown.preview.refresh.title": "Refresh Preview",
 	"markdown.preview.toggleLock.title": "Toggle Preview Locking",
-	"configuration.markdown.preview.openMarkdownLinks.description": "Controls how links to other markdown files in the markdown preview should be opened.",
-	"configuration.markdown.preview.openMarkdownLinks.inEditor": "Try to open links in the editor",
-	"configuration.markdown.preview.openMarkdownLinks.inPreview": "Try to open links in the markdown preview",
-	"configuration.markdown.links.openLocation.description": "Controls where links in markdown files should be opened.",
+	"configuration.markdown.preview.openMarkdownLinks.description": "Controls how links to other Markdown files in the Markdown preview should be opened.",
+	"configuration.markdown.preview.openMarkdownLinks.inEditor": "Try to open links in the editor.",
+	"configuration.markdown.preview.openMarkdownLinks.inPreview": "Try to open links in the Markdown preview.",
+	"configuration.markdown.links.openLocation.description": "Controls where links in Markdown files should be opened.",
 	"configuration.markdown.links.openLocation.currentGroup": "Open links in the active editor group.",
 	"configuration.markdown.links.openLocation.beside": "Open links beside the active editor."
 }

extensions/markdown-language-features/src/features/previewContentProvider.ts

@@ -28,7 +28,7 @@ const previewStrings = {
 
 	cspAlertMessageTitle: localize(
 		'preview.securityMessage.title',
-		'Potentially unsafe or insecure content has been disabled in the markdown preview. Change the Markdown preview security setting to allow insecure content or enable scripts'),
+		'Potentially unsafe or insecure content has been disabled in the Markdown preview. Change the Markdown preview security setting to allow insecure content or enable scripts'),
 
 	cspAlertMessageLabel: localize(
 		'preview.securityMessage.label',

extensions/markdown-language-features/src/test/index.ts

@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
-	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 

extensions/markdown-language-features/webpack.config.js

@@ -5,9 +5,11 @@
 const path = require('path');
 
 module.exports = {
+	context: path.resolve(__dirname),
+	mode: 'production',
 	entry: {
 		index: './preview-src/index.ts',
-		pre: './preview-src/pre.ts'
+		pre: './preview-src/pre.ts',
 	},
 	module: {
 		rules: [

extensions/markdown-language-features/webpack.notebook.js

@@ -5,8 +5,9 @@
 const path = require('path');
 
 module.exports = {
+	mode: 'production',
 	entry: {
-		index: './notebook/index.ts'
+		index: path.join(__dirname, 'notebook', 'index.ts')
 	},
 	module: {
 		rules: [

extensions/markdown-language-features/yarn.lock

@@ -31,24 +31,57 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
   integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
-applicationinsights@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
-  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
+applicationinsights@1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.7.4.tgz#e7d96435594d893b00cf49f70a5927105dbb8749"
+  integrity sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==
   dependencies:
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
     diagnostic-channel "0.2.0"
-    diagnostic-channel-publishers "0.2.1"
-    zone.js "0.7.6"
+    diagnostic-channel-publishers "^0.3.3"
 
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-diagnostic-channel-publishers@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
-  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
+
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
+diagnostic-channel-publishers@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
+  integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
 
 diagnostic-channel@0.2.0:
   version "0.2.0"
@@ -57,6 +90,13 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -105,6 +145,21 @@ semver@^5.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
+semver@^5.4.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
+
 uc.micro@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
@@ -115,19 +170,14 @@ uc.micro@^1.0.5:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
   integrity sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==
 
-vscode-extension-telemetry@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
-  integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA==
+vscode-extension-telemetry@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.7.tgz#18389bc24127c89dade29cd2b71ba69a6ee6ad26"
+  integrity sha512-pZuZTHO9OpsrwlerOKotWBRLRYJ53DobYb7aWiRAXjlqkuqE+YJJaP+2WEy8GrLIF1EnitXTDMaTAKsmLQ5ORQ==
   dependencies:
-    applicationinsights "1.0.8"
+    applicationinsights "1.7.4"
 
 vscode-nls@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
   integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
-
-zone.js@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=

extensions/microsoft-authentication/package.json

@@ -52,7 +52,7 @@
     "sha.js": "2.4.11",
     "stream": "0.0.2",
     "uuid": "^8.2.0",
-    "vscode-extension-telemetry": "0.1.1",
+    "vscode-extension-telemetry": "0.1.7",
     "vscode-nls": "^4.1.1"
   },
   "repository": {

extensions/microsoft-authentication/src/AADHelper.ts

@@ -317,7 +317,10 @@ export class AzureActiveDirectoryService {
 		}
 
 		return new Promise(async (resolve, reject) => {
-			if (vscode.env.remoteName !== undefined) {
+			const runsRemote = vscode.env.remoteName !== undefined;
+			const runsServerless = vscode.env.remoteName === undefined && vscode.env.uiKind === vscode.UIKind.Web;
+
+			if (runsRemote || runsServerless) {
 				resolve(this.loginWithoutLocalServer(scope));
 				return;
 			}
@@ -654,7 +657,8 @@ export class AzureActiveDirectoryService {
 
 		this._refreshTimeouts.set(sessionId, setTimeout(async () => {
 			try {
-				await this.refreshToken(refreshToken, scope, sessionId);
+				const refreshedToken = await this.refreshToken(refreshToken, scope, sessionId);
+				onDidChangeSessions.fire({ added: [], removed: [], changed: [this.convertToSessionSync(refreshedToken)] });
 			} catch (e) {
 				this.pollForReconnect(sessionId, refreshToken, scope);
 			}
@@ -668,21 +672,14 @@ export class AzureActiveDirectoryService {
 				return resolve(false);
 			}
 
-			if (attempts === 1) {
-				const token = this._tokens.find(token => token.sessionId === sessionId);
-				if (token) {
-					token.accessToken = undefined;
-					onDidChangeSessions.fire({ added: [], removed: [], changed: [this.convertToSessionSync(token)] });
-				}
-			}
-
 			const delayBeforeRetry = 5 * attempts * attempts;
 
 			this.clearSessionTimeout(sessionId);
 
 			this._refreshTimeouts.set(sessionId, setTimeout(async () => {
 				try {
-					await this.refreshToken(refreshToken, scope, sessionId);
+					const refreshedToken = await this.refreshToken(refreshToken, scope, sessionId);
+					onDidChangeSessions.fire({ added: [], removed: [], changed: [this.convertToSessionSync(refreshedToken)] });
 					return resolve(true);
 				} catch (e) {
 					return resolve(await this.handleRefreshNetworkError(sessionId, refreshToken, scope, attempts + 1));

extensions/microsoft-authentication/tsconfig.json

@@ -17,5 +17,6 @@
 		"strict": true,
 		"target": "es2019"
 	},
-	"exclude": ["node_modules"]
+	"exclude": ["node_modules"],
+	"include": ["src/**/*"]
 }

extensions/microsoft-authentication/yarn.lock

@@ -39,14 +39,30 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
   integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
 
-applicationinsights@1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
-  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
+applicationinsights@1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.7.4.tgz#e7d96435594d893b00cf49f70a5927105dbb8749"
+  integrity sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==
   dependencies:
+    cls-hooked "^4.2.2"
+    continuation-local-storage "^3.2.1"
     diagnostic-channel "0.2.0"
-    diagnostic-channel-publishers "0.2.1"
-    zone.js "0.7.6"
+    diagnostic-channel-publishers "^0.3.3"
+
+async-hook-jl@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
+  integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
+  dependencies:
+    stack-chain "^1.3.7"
+
+async-listener@^0.6.0:
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
+  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
+  dependencies:
+    semver "^5.3.0"
+    shimmer "^1.1.0"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -66,6 +82,15 @@ buffer@^5.6.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
+cls-hooked@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
+  integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
+  dependencies:
+    async-hook-jl "^1.7.6"
+    emitter-listener "^1.0.1"
+    semver "^5.4.1"
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -73,15 +98,23 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+continuation-local-storage@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
+  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
+  dependencies:
+    async-listener "^0.6.0"
+    emitter-listener "^1.1.1"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-diagnostic-channel-publishers@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
-  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=
+diagnostic-channel-publishers@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
+  integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
 
 diagnostic-channel@0.2.0:
   version "0.2.0"
@@ -95,6 +128,13 @@ emitter-component@^1.1.1:
   resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
   integrity sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY=
 
+emitter-listener@^1.0.1, emitter-listener@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -147,7 +187,7 @@ safe-buffer@^5.1.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-semver@^5.3.0:
+semver@^5.3.0, semver@^5.4.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -160,6 +200,16 @@ sha.js@2.4.11:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shimmer@^1.1.0, shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+stack-chain@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
+  integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
+
 stream@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
@@ -172,19 +222,14 @@ uuid@^8.2.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
   integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==
 
-vscode-extension-telemetry@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
-  integrity sha512-TkKKG/B/J94DP5qf6xWB4YaqlhWDg6zbbqVx7Bz//stLQNnfE9XS1xm3f6fl24c5+bnEK0/wHgMgZYKIKxPeUA==
+vscode-extension-telemetry@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.7.tgz#18389bc24127c89dade29cd2b71ba69a6ee6ad26"
+  integrity sha512-pZuZTHO9OpsrwlerOKotWBRLRYJ53DobYb7aWiRAXjlqkuqE+YJJaP+2WEy8GrLIF1EnitXTDMaTAKsmLQ5ORQ==
   dependencies:
-    applicationinsights "1.0.8"
+    applicationinsights "1.7.4"
 
 vscode-nls@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
   integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
-
-zone.js@0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
-  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=